commit f1e7136cce95b5b05063d987e5ea4452110b2341
author Perry Wu <wuperry@google.com> Fri Jul 26 16:14:42 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 26 16:14:42 2024 +0000
tree 97df9562364bd885cb5d73e9539df65ef8dd3b5d
parent b7b48bbbd374e5a89fb12071dcab4ef1d9a761b5
parent 603f408bf896b4e4795e7e83414b4c62d80e3c53

Merge "Fix launcher KCA updates when entering -1 screen" into main

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index bbc6b42..d678c46 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -258,6 +258,8 @@
 
     private boolean mCanShowAllAppsEducationView;
 
+    private boolean mIsOverlayVisible;
+
     public static QuickstepLauncher getLauncher(Context context) {
         return fromContext(context);
     }
@@ -495,7 +497,8 @@
                     (getActivityFlags() & ACTIVITY_STATE_USER_WILL_BE_ACTIVE) != 0;
             boolean visible = (state == NORMAL || state == OVERVIEW)
                     && (willUserBeActive || isUserActive())
-                    && !profile.isVerticalBarLayout();
+                    && !profile.isVerticalBarLayout()
+                    && !mIsOverlayVisible;
             SystemUiProxy.INSTANCE.get(this)
                     .setLauncherKeepClearAreaHeight(visible, profile.hotseatBarSizePx);
         }
@@ -505,6 +508,12 @@
     }
 
     @Override
+    public void onOverlayVisibilityChanged(boolean visible) {
+        super.onOverlayVisibilityChanged(visible);
+        mIsOverlayVisible = visible;
+    }
+
+    @Override
     public void bindExtraContainerItems(FixedContainerItems item) {
         if (item.containerId == Favorites.CONTAINER_PREDICTION) {
             mAllAppsPredictions = item;