From e32f48469383888e0961dd12c471be7c4f3cb781 Mon Sep 17 00:00:00 2001 From: Becky Qiu Date: Wed, 8 Apr 2020 14:56:30 -0700 Subject: [PATCH] [Overview Actions] Update Overview UI to match new spec. See spec in the design: https://docs.google.com/presentation/d/1gXWNdCRXvXuEhgDmE0TX2KYqCxIQBXVtWKdl4pKrno8/edit#slide=id.g6f30ae9caf_14_4 Test: local Bug: 139828243 Change-Id: I6e01dd5de4e4d9ccb4ec7febe81b3e789119bfa0 --- .../src/com/android/quickstep/views/TaskView.java | 3 +-- quickstep/res/values/dimens.xml | 3 +-- quickstep/src/com/android/quickstep/util/LayoutUtils.java | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) 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 9193efba50..470b720f5e 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 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { } // 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 7f1a8bf3d8..6d8d54f389 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -17,8 +17,7 @@ 24dp - 60dp - 76dp + 44dp 12dp 48dp diff --git a/quickstep/src/com/android/quickstep/util/LayoutUtils.java b/quickstep/src/com/android/quickstep/util/LayoutUtils.java index f71bcfbdd4..1f1a99937e 100644 --- a/quickstep/src/com/android/quickstep/util/LayoutUtils.java +++ b/quickstep/src/com/android/quickstep/util/LayoutUtils.java @@ -122,9 +122,7 @@ public class LayoutUtils { 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)