summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shawn Lee <syeonlee@google.com> 2023-09-18 14:08:06 -0700
committer Shawn Lee <syeonlee@google.com> 2023-09-19 22:50:34 +0000
commit9a2a703029248c5b67a08585b56e5e93a225ac84 (patch)
tree7e0df54e94a48598e8aa7db49ee3ce467e6c1c76
parent71a57780ef4a28de80d5fdb115046e8b7e747c6c (diff)
Mark shade header system icons as not clickable in non-large screen shade
The new system icons container was prompting TalkBack users to activate it, when doing so does not have any effect. Bug: 297472710 Test: walked through TalkBack to verify the system icons are read out without activation prompt Change-Id: Ib4f49d67b9864271153d3cb26e1863e0bdc77634
-rw-r--r--packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeHeaderController.kt
index 9a356ad1fd0b..19a4ee8ef6a0 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 @@ constructor(
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()