From 39fc1171602643476e0011ffc9affc28496cf3bb Mon Sep 17 00:00:00 2001 From: Shawn Lee Date: Thu, 5 Sep 2024 11:29:10 -0700 Subject: [flexiglass] Fixes QS header never being set invisible when unlocked. Bug: 306674974 Test: verified header visibility is no longer VISIBLE when unlocked with closed shade. Flag: com.android.systemui.scene_container Change-Id: If53ba2b31705b52386e6eb521d111d83154eb829 --- .../com/android/systemui/shade/QuickSettingsControllerImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java index 830649be2a98..4ed4af647fdf 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java @@ -42,6 +42,7 @@ import android.util.Log; import android.util.MathUtils; import android.view.MotionEvent; import android.view.VelocityTracker; +import android.view.View; import android.view.ViewConfiguration; import android.view.ViewGroup; import android.view.WindowInsets; @@ -463,6 +464,9 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum mJavaAdapter.alwaysCollectFlow( mCommunalTransitionViewModelLazy.get().isUmoOnCommunal(), this::setShouldUpdateSquishinessOnMedia); + mJavaAdapter.alwaysCollectFlow( + mShadeInteractor.isAnyExpanded(), + this::onAnyExpandedChanged); } private void initNotificationStackScrollLayoutController() { @@ -482,6 +486,10 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum } } + private void onAnyExpandedChanged(boolean isAnyExpanded) { + mQsFrame.setVisibility(isAnyExpanded ? View.VISIBLE : View.INVISIBLE); + } + private void onNotificationScrolled(int newScrollPosition) { updateExpansionEnabledAmbient(); } -- cgit v1.2.3-59-g8ed1b