commit f13f49c568ff4e811c9eeb7d5e41a2e5a47c771a
author Shawn Lee <syeonlee@google.com> Wed Sep 20 20:36:30 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 20 20:36:30 2023 +0000
tree ced34556e197cf07e3086347ad75b5cf8ee3bd7e
parent 7557d65ca03cbda2f3a3566aa997967d8e435847
parent 9a2a703029248c5b67a08585b56e5e93a225ac84

Merge "Mark shade header system icons as not clickable in non-large screen shade" into main

packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt

diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
index 9a356ad..19a4ee8 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
@@ -484,11 +484,13 @@
         if (largeScreenActive) {
             logInstantEvent("Large screen constraints set")
             header.setTransition(LARGE_SCREEN_HEADER_TRANSITION_ID)
+            systemIconsHoverContainer.isClickable = true
             systemIconsHoverContainer.setOnClickListener { shadeCollapseAction?.run() }
         } else {
             logInstantEvent("Small screen constraints set")
             header.setTransition(HEADER_TRANSITION_ID)
             systemIconsHoverContainer.setOnClickListener(null)
+            systemIconsHoverContainer.isClickable = false
         }
         header.jumpToState(header.startState)
         updatePosition()