[Overview Actions] Update Overview UI to match new spec. am: e32f484693
Change-Id: I2087229f76999c7eb7b29c7d089a2040953182dd
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
index 9193efb..470b720 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
@@ -268,8 +268,7 @@
}
// Sets animations for modal UI. We will remove the margins to zoom in the snapshot.
- float topMargin =
- getResources().getDimension(R.dimen.task_thumbnail_top_margin_with_actions);
+ float topMargin = getResources().getDimension(R.dimen.task_thumbnail_top_margin);
float bottomMargin =
getResources().getDimension(R.dimen.task_thumbnail_bottom_margin_with_actions);
float newHeight = mSnapshotView.getHeight() + topMargin + bottomMargin;
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 7f1a8bf..6d8d54f 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -17,8 +17,7 @@
<resources>
<dimen name="task_thumbnail_top_margin">24dp</dimen>
- <dimen name="task_thumbnail_top_margin_with_actions">60dp</dimen>
- <dimen name="task_thumbnail_bottom_margin_with_actions">76dp</dimen>
+ <dimen name="task_thumbnail_bottom_margin_with_actions">44dp</dimen>
<dimen name="task_thumbnail_half_top_margin">12dp</dimen>
<dimen name="task_thumbnail_icon_size">48dp</dimen>
<!-- For screens without rounded corners -->
diff --git a/quickstep/src/com/android/quickstep/util/LayoutUtils.java b/quickstep/src/com/android/quickstep/util/LayoutUtils.java
index f71bcfb..1f1a999 100644
--- a/quickstep/src/com/android/quickstep/util/LayoutUtils.java
+++ b/quickstep/src/com/android/quickstep/util/LayoutUtils.java
@@ -122,9 +122,7 @@
paddingHorz = res.getDimension(paddingResId);
}
- float topIconMargin = overviewActionsEnabled
- ? res.getDimension(R.dimen.task_thumbnail_top_margin_with_actions)
- : res.getDimension(R.dimen.task_thumbnail_top_margin);
+ float topIconMargin = res.getDimension(R.dimen.task_thumbnail_top_margin);
float bottomMargin = thumbnailBottomMargin(context);
float paddingVert = overviewActionsEnabled && removeShelfFromOverview(context)