Merge "ShareTargets animations and styling." into sc-dev
This commit is contained in:
commit
1408c6459c
|
@ -189,6 +189,14 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
|
||||||
|
|
||||||
/** Updates vertical margins for different navigation mode or configuration changes. */
|
/** Updates vertical margins for different navigation mode or configuration changes. */
|
||||||
public void updateVerticalMargin(Mode mode) {
|
public void updateVerticalMargin(Mode mode) {
|
||||||
|
LayoutParams actionParams = (LayoutParams) findViewById(
|
||||||
|
R.id.action_buttons).getLayoutParams();
|
||||||
|
actionParams.setMargins(
|
||||||
|
actionParams.leftMargin, actionParams.topMargin, actionParams.rightMargin,
|
||||||
|
getBottomVerticalMargin(mode));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected int getBottomVerticalMargin(Mode mode) {
|
||||||
int bottomMargin;
|
int bottomMargin;
|
||||||
int orientation = getResources().getConfiguration().orientation;
|
int orientation = getResources().getConfiguration().orientation;
|
||||||
if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
|
if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
|
||||||
|
@ -201,8 +209,6 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
|
||||||
.getDimensionPixelSize(R.dimen.overview_actions_bottom_margin_gesture);
|
.getDimensionPixelSize(R.dimen.overview_actions_bottom_margin_gesture);
|
||||||
}
|
}
|
||||||
bottomMargin += mInsets.bottom;
|
bottomMargin += mInsets.bottom;
|
||||||
LayoutParams params = (LayoutParams) getLayoutParams();
|
return bottomMargin;
|
||||||
params.setMargins(
|
|
||||||
params.leftMargin, params.topMargin, params.rightMargin, bottomMargin);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue