diff options
3 files changed, 28 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java index 84d7e65d289b..27d9da6c2e1e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -25,6 +25,7 @@ import android.graphics.Rect; import android.util.AttributeSet; import android.util.Pair; import android.view.DisplayCutout; +import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.view.WindowInsets; @@ -231,6 +232,16 @@ public class QuickStatusBarHeader extends FrameLayout { } } + @Override + public boolean onTouchEvent(MotionEvent event) { + // If using combined headers, only react to touches inside QuickQSPanel + if (!mUseCombinedQSHeader || event.getY() > mHeaderQsPanel.getTop()) { + return super.onTouchEvent(event); + } else { + return false; + } + } + void updateResources() { Resources resources = mContext.getResources(); boolean largeScreenHeaderActive = diff --git a/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt index d3ed47407b9d..a494f42985ac 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/LargeScreenShadeHeaderController.kt @@ -280,6 +280,9 @@ class LargeScreenShadeHeaderController @Inject constructor( context.getString(com.android.internal.R.string.status_bar_alarm_clock) ) } + if (combinedHeaders) { + privacyIconsController.onParentVisible() + } } override fun onViewAttached() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/LargeScreenShadeHeaderControllerCombinedTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/LargeScreenShadeHeaderControllerCombinedTest.kt index c76d9e7a2b20..0151822f871c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/LargeScreenShadeHeaderControllerCombinedTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/LargeScreenShadeHeaderControllerCombinedTest.kt @@ -645,6 +645,20 @@ class LargeScreenShadeHeaderControllerCombinedTest : SysuiTestCase() { verify(animator).start() } + @Test + fun privacyChipParentVisibleFromStart() { + verify(privacyIconsController).onParentVisible() + } + + @Test + fun privacyChipParentVisibleAlways() { + controller.largeScreenActive = true + controller.largeScreenActive = false + controller.largeScreenActive = true + + verify(privacyIconsController, never()).onParentInvisible() + } + private fun createWindowInsets( topCutout: Rect? = Rect() ): WindowInsets { |