Merge "Creaet separate pull back animation for AllApps" into tm-dev
diff --git a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
index 6b15807..99a2d6f 100644
--- a/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
+++ b/quickstep/src/com/android/quickstep/views/OverviewActionsView.java
@@ -155,7 +155,7 @@
public void setInsets(Rect insets) {
mInsets.set(insets);
updateVerticalMargin(DisplayController.getNavigationMode(getContext()));
- updatePaddingAndTranslations();
+ updatePadding();
}
public void updateHiddenFlags(@ActionsHiddenFlags int visibilityFlags, boolean enable) {
@@ -199,10 +199,9 @@
}
/**
- * Aligns OverviewActionsView vertically with and offsets horizontal position based on
- * 3 button nav container in taskbar.
+ * Offsets OverviewActionsView horizontal position based on 3 button nav container in taskbar.
*/
- private void updatePaddingAndTranslations() {
+ private void updatePadding() {
boolean alignFor3ButtonTaskbar = mDp.isTaskbarPresent &&
DisplayController.getNavigationMode(getContext()) == THREE_BUTTONS;
if (alignFor3ButtonTaskbar) {
@@ -213,20 +212,8 @@
} else {
setPadding(mInsets.left, 0, mInsets.right + additionalPadding, 0);
}
-
- // Align vertically, using taskbar height + mDp.taskbarOffsetY() to estimate where
- // the button nav top is.
- int marginBottom = getOverviewActionsBottomMarginPx(
- DisplayController.getNavigationMode(getContext()), mDp);
- int actionsTop =
- (mDp.heightPx - marginBottom - mInsets.bottom) - mDp.overviewActionsHeight;
- int navTop = mDp.heightPx - (mDp.taskbarSize + mDp.getTaskbarOffsetY());
- int transY = navTop - actionsTop + ((mDp.taskbarSize - mDp.overviewActionsHeight) / 2);
- setTranslationY(transY);
} else {
setPadding(mInsets.left, 0, mInsets.right, 0);
- setTranslationX(0);
- setTranslationY(0);
}
}
@@ -287,19 +274,28 @@
/** Get the bottom margin associated with the action buttons in Overview. */
public static int getOverviewActionsBottomMarginPx(NavigationMode mode, DeviceProfile dp) {
- int inset = dp.getInsets().bottom;
+ int bottomInset = dp.getInsets().bottom;
if (dp.isVerticalBarLayout()) {
- return inset;
+ return bottomInset;
}
- // Actions button will be aligned with nav buttons in updatePaddingAndTranslations().
if (mode == NavigationMode.THREE_BUTTONS) {
- return dp.overviewActionsMarginThreeButtonPx + inset;
+ int bottomMargin = dp.overviewActionsMarginThreeButtonPx + bottomInset;
+ if (dp.isTaskbarPresent) {
+ // Align vertically, using taskbar height + mDp.taskbarOffsetY() to estimate where
+ // the button nav top is.
+ int actionsTop = (dp.heightPx - bottomMargin - bottomInset)
+ - dp.overviewActionsHeight;
+ int navTop = dp.heightPx - (dp.taskbarSize + dp.getTaskbarOffsetY());
+ bottomMargin -=
+ navTop - actionsTop + ((dp.taskbarSize - dp.overviewActionsHeight) / 2);
+ }
+ return bottomMargin;
}
// There is no bottom inset when taskbar is present, use stashed taskbar as padding instead.
return dp.overviewActionsBottomMarginGesturePx
- + (dp.isTaskbarPresent ? dp.stashedTaskbarSize : inset);
+ + (dp.isTaskbarPresent ? dp.stashedTaskbarSize : bottomInset);
}
}
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 602dd6d..eb347f2 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -38,10 +38,10 @@
<!-- Hotseat -->
<dimen name="dynamic_grid_hotseat_side_padding">0dp</dimen>
- <dimen name="spring_loaded_hotseat_top_margin">97dp</dimen>
+ <dimen name="spring_loaded_hotseat_top_margin">65dp</dimen>
<!-- Dragging -->
- <dimen name="drop_target_top_margin">34dp</dimen>
+ <dimen name="drop_target_top_margin">64dp</dimen>
<dimen name="drop_target_bottom_margin">16dp</dimen>
<dimen name="drop_target_button_drawable_horizontal_padding">16dp</dimen>
<dimen name="drop_target_button_drawable_vertical_padding">16dp</dimen>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 3ec211a..fad8c95 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -28,11 +28,11 @@
<dimen name="drop_target_button_drawable_horizontal_padding">24dp</dimen>
<dimen name="drop_target_button_drawable_vertical_padding">20dp</dimen>
<dimen name="drop_target_button_gap">32dp</dimen>
- <dimen name="drop_target_top_margin">32dp</dimen>
- <dimen name="drop_target_bottom_margin">32dp</dimen>
+ <dimen name="drop_target_top_margin">110dp</dimen>
+ <dimen name="drop_target_bottom_margin">48dp</dimen>
<!-- Hotseat -->
- <dimen name="spring_loaded_hotseat_top_margin">164dp</dimen>
+ <dimen name="spring_loaded_hotseat_top_margin">108dp</dimen>
<!-- Widget picker-->
<dimen name="widget_list_horizontal_margin">30dp</dimen>