From 56bd257478c931cea786ebf481d4c90631cfaa66 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 3 Nov 2021 18:48:18 +0000
Subject: [PATCH] Update overview clear all button to be larger

- Tuned the size and corner radius
- Tuned the margin from screen edge
- Tuned the vertical position

Bug: 204153113
Test: manual
Change-Id: Ibf3df599b31c7ecc2c9c951fc89e7e09c90253ef
---
 quickstep/res/drawable/bg_overview_clear_all_button.xml     | 2 +-
 quickstep/res/values/dimens.xml                             | 3 ++-
 quickstep/res/values/styles.xml                             | 4 ++--
 .../src/com/android/quickstep/BaseActivityInterface.java    | 2 +-
 .../src/com/android/quickstep/views/ClearAllButton.java     | 6 +++++-
 res/values/dimens.xml                                       | 2 ++
 src/com/android/launcher3/DeviceProfile.java                | 4 ++++
 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/quickstep/res/drawable/bg_overview_clear_all_button.xml b/quickstep/res/drawable/bg_overview_clear_all_button.xml
index 47cbd9faba..fb014f75b1 100644
--- a/quickstep/res/drawable/bg_overview_clear_all_button.xml
+++ b/quickstep/res/drawable/bg_overview_clear_all_button.xml
@@ -20,7 +20,7 @@
     <item>
         <shape android:shape="rectangle"
             android:tint="?colorButtonNormal">
-            <corners android:radius="18dp" />
+            <corners android:radius="24dp" />
             <solid android:color="?androidprv:attr/colorSurface"/>
         </shape>
     </item>
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index 98d43f1bbc..0b534e31e9 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -46,7 +46,8 @@
     <dimen name="overview_actions_margin_three_button">8dp</dimen>
     <dimen name="overview_actions_horizontal_margin">16dp</dimen>
 
-    <dimen name="overview_grid_side_margin">50dp</dimen>
+    <dimen name="overview_grid_side_margin_portrait">60dp</dimen>
+    <dimen name="overview_grid_side_margin_landscape">52dp</dimen>
     <dimen name="overview_grid_row_spacing_portrait">17.13dp</dimen>
     <dimen name="overview_grid_row_spacing_landscape">13.38dp</dimen>
     <dimen name="overview_grid_focus_vertical_margin">0dp</dimen>
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index 40e18ec11f..2efe72e651 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -137,8 +137,8 @@
 
     <style name="OverviewClearAllButton" parent="@android:style/Widget.DeviceDefault.Button">
         <item name="android:background">@drawable/bg_overview_clear_all_button</item>
-        <item name="android:minWidth">85dp</item>
-        <item name="android:minHeight">36dp</item>
+        <item name="android:minWidth">96dp</item>
+        <item name="android:minHeight">48dp</item>
         <item name="android:stateListAnimator">@null</item>
     </style>
 
diff --git a/quickstep/src/com/android/quickstep/BaseActivityInterface.java b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
index cf06036ffa..944fb48c36 100644
--- a/quickstep/src/com/android/quickstep/BaseActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseActivityInterface.java
@@ -308,7 +308,7 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T
         Rect insets = dp.getInsets();
         int topMargin = dp.overviewTaskThumbnailTopMarginPx;
         int bottomMargin = getOverviewActionsHeight(context, dp);
-        int sideMargin = res.getDimensionPixelSize(R.dimen.overview_grid_side_margin);
+        int sideMargin = dp.overviewGridSideMargin;
 
         outRect.set(0, 0, dp.widthPx, dp.heightPx);
         outRect.inset(Math.max(insets.left, sideMargin), insets.top + topMargin,
diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
index 86be2109ad..4f2ed4cd82 100644
--- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java
+++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
@@ -21,6 +21,7 @@ import android.util.AttributeSet;
 import android.util.FloatProperty;
 import android.widget.Button;
 
+import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.statemanager.StatefulActivity;
 import com.android.launcher3.touch.PagedOrientationHandler;
 
@@ -245,6 +246,9 @@ public class ClearAllButton extends Button {
      * Get the Y translation that is set in the original layout position, before scrolling.
      */
     private float getOriginalTranslationY() {
-        return mActivity.getDeviceProfile().overviewTaskThumbnailTopMarginPx / 2.0f;
+        DeviceProfile deviceProfile = mActivity.getDeviceProfile();
+        return deviceProfile.overviewShowAsGrid
+                ? deviceProfile.overviewRowSpacing
+                : deviceProfile.overviewTaskThumbnailTopMarginPx / 2.0f;
     }
 }
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4d137c84b5..2cf929f6dd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -333,6 +333,8 @@
     <dimen name="overview_actions_top_margin_gesture_grid_landscape">0dp</dimen>
     <dimen name="overview_actions_bottom_margin_gesture_grid_landscape">0dp</dimen>
     <dimen name="overview_actions_margin_three_button">0dp</dimen>
+    <dimen name="overview_grid_side_margin_portrait">0dp</dimen>
+    <dimen name="overview_grid_side_margin_landscape">0dp</dimen>
     <dimen name="overview_grid_row_spacing_portrait">0dp</dimen>
     <dimen name="overview_grid_row_spacing_landscape">0dp</dimen>
     <dimen name="recents_page_spacing">0dp</dimen>
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 0b60b32275..5c16b4c0d6 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -193,6 +193,7 @@ public class DeviceProfile {
     public final int overviewActionsBottomMarginGesturePx;
     public int overviewPageSpacing;
     public int overviewRowSpacing;
+    public int overviewGridSideMargin;
 
     // Widgets
     public final PointF appWidgetScale = new PointF(1.0f, 1.0f);
@@ -399,6 +400,9 @@ public class DeviceProfile {
         overviewRowSpacing = isLandscape
                 ? res.getDimensionPixelSize(R.dimen.overview_grid_row_spacing_landscape)
                 : res.getDimensionPixelSize(R.dimen.overview_grid_row_spacing_portrait);
+        overviewGridSideMargin = isLandscape
+                ? res.getDimensionPixelSize(R.dimen.overview_grid_side_margin_landscape)
+                : res.getDimensionPixelSize(R.dimen.overview_grid_side_margin_portrait);
 
         // Calculate all of the remaining variables.
         extraSpace = updateAvailableDimensions(res);