commit 4ecef9aae664ec5e98a66ace68706e3847847395
author helencheuk <helencheuk@google.com> Mon Jun 12 14:10:21 2023 +0100
committer Helen Cheuk <helencheuk@google.com> Thu Jun 22 10:45:36 2023 +0000
tree d24ad006e7f20b4f902a78e29588e7355e16f956
parent d285515c120fea3a48c0c3ba8ff38d84f613af0c

Align ClearAllButton to centre when the ENABLE_GRID_ONLY_OVERVIEW is enabled

Bug: 271570406
Flag: ENABLE_GRID_ONLY_OVERVIEW
Test: Test postponed due to b/288389556
Change-Id: Ifab0705a45cfea45199ed0db69ef7ad20f935023

quickstep/src/com/android/quickstep/views/ClearAllButton.java

diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
index 6813857..19ac1f8 100644
--- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java
+++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.java
@@ -16,6 +16,8 @@
 
 package com.android.quickstep.views;
 
+import static com.android.launcher3.config.FeatureFlags.ENABLE_GRID_ONLY_OVERVIEW;
+
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.FloatProperty;
@@ -248,8 +250,15 @@
      */
     private float getOriginalTranslationY() {
         DeviceProfile deviceProfile = mActivity.getDeviceProfile();
-        return deviceProfile.isTablet
-                ? deviceProfile.overviewRowSpacing
-                : deviceProfile.overviewTaskThumbnailTopMarginPx / 2.0f;
+        if (deviceProfile.isTablet) {
+            if (ENABLE_GRID_ONLY_OVERVIEW.get()) {
+                return (getRecentsView().getLastComputedTaskSize().height()
+                        + deviceProfile.overviewTaskThumbnailTopMarginPx) / 2.0f
+                        + deviceProfile.overviewRowSpacing;
+            } else {
+                return deviceProfile.overviewRowSpacing;
+            }
+        }
+        return deviceProfile.overviewTaskThumbnailTopMarginPx / 2.0f;
     }
 }