From 9a15b7c5ae65ed09b46230e1aef115e4799712c8 Mon Sep 17 00:00:00 2001 From: Fabian Kozynski Date: Thu, 10 Jan 2019 11:13:27 -0500 Subject: [PATCH] Sets clickability of QuickStatusBarHeader Sets the clickability based on QS expansion. Then, when it's expanded, it is not clickable as QSPanel captures clicks. The top status bar is always clickable Test: manual, including brightness slider Change-Id: Id41473f823285f115240effbea7a2d52596b9bfe Fixes: 120873445 --- .../res/layout/quick_status_bar_header_system_icons.xml | 1 + .../src/com/android/systemui/qs/QuickStatusBarHeader.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml b/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml index 22b8d2ff4db0a..4b65b6a013f82 100644 --- a/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml +++ b/packages/SystemUI/res/layout/quick_status_bar_header_system_icons.xml @@ -24,6 +24,7 @@ android:clipToPadding="false" android:gravity="center" android:orientation="horizontal" + android:clickable="true" android:paddingStart="@dimen/status_bar_padding_start" android:paddingEnd="@dimen/status_bar_padding_end" > diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java index 40c60396e40dd..28285e14ef4b3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -699,7 +699,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements } public void updateEverything() { - post(() -> setClickable(false)); + post(() -> setClickable(!mExpanded)); } public void setQSPanel(final QSPanel qsPanel) {