From baf0307494b29fedeec27004665572f1c2fc9af0 Mon Sep 17 00:00:00 2001
From: mpodolian <mpodolian@google.com>
Date: Wed, 17 Jul 2024 22:32:54 +0100
Subject: [PATCH] Added scrim visibility check.

Scrim view was not shown because the TaskbarScrimViewController did not
check taskbar visibility on initialization. Added the check to fix the
issue.

Fixes: 353583417
Flag: com.android.wm.shell.enable_bubble_bar
Test: manual
Switch task bar to transient mode on overview screen or inside an
application. Expand bubble bar.

Change-Id: Ia8a05802a779a4bac70906e7e52ac6650308c85c
---
 .../launcher3/taskbar/TaskbarScrimViewController.java      | 3 ++-
 .../android/launcher3/taskbar/TaskbarViewController.java   | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java
index 48d2bc2ff7..5e7c7cedf4 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java
@@ -20,8 +20,8 @@ import static android.view.View.VISIBLE;
 import static com.android.launcher3.taskbar.bubbles.BubbleBarController.isBubbleBarEnabled;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_EXPANDED;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED;
-import static com.android.wm.shell.common.bubbles.BubbleConstants.BUBBLE_EXPANDED_SCRIM_ALPHA;
 import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_VISIBLE;
+import static com.android.wm.shell.common.bubbles.BubbleConstants.BUBBLE_EXPANDED_SCRIM_ALPHA;
 
 import android.animation.ObjectAnimator;
 import android.view.animation.Interpolator;
@@ -65,6 +65,7 @@ public class TaskbarScrimViewController implements TaskbarControllers.LoggableTa
      */
     public void init(TaskbarControllers controllers) {
         mControllers = controllers;
+        onTaskbarVisibilityChanged(mControllers.taskbarViewController.getTaskbarVisibility());
     }
 
     /**
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
index 527e3a3cc1..c21a031864 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
@@ -229,6 +229,13 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
         mActivity.removeOnDeviceProfileChangeListener(mDeviceProfileChangeListener);
     }
 
+    /**
+     * Gets the taskbar {@link View.Visibility visibility}.
+     */
+    public int getTaskbarVisibility() {
+        return mTaskbarView.getVisibility();
+    }
+
     public boolean areIconsVisible() {
         return mTaskbarView.areIconsVisible();
     }