summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2017-03-08 09:39:21 -0500
committer Jason Monk <jmonk@google.com> 2017-03-08 09:41:17 -0500
commit1fdde2da76538d2fc90cd6ecb7bff237d52523ce (patch)
tree359965c5865e6b089fd8bcfa6d4403395b52ddb6
parent137b460e5fb2e4426504ad5315688f2fd71b7354 (diff)
Fix random clicks in QS
The entire header was getting set as clickable because of old code which would eat the clicks of the brightness slider (and other things) when expanded. Fixes: 35628944 Test: Trigger expandable update (like clear user_setup and set it) then click on brightness in QS Change-Id: I2d23aabf6b8a5b05f3b2b93ee723ec145514ce5e
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/QSFragment.java3
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java4
2 files changed, 2 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
index 3a93d51abce3..63563b2e31ed 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
@@ -162,8 +162,7 @@ public class QSFragment extends Fragment implements QS {
public void setHeaderClickable(boolean clickable) {
if (DEBUG) Log.d(TAG, "setHeaderClickable " + clickable);
- mHeader.setClickable(clickable);
- mFooter.setClickable(clickable);
+ mFooter.getExpandView().setClickable(clickable);
}
public void setExpanded(boolean expanded) {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
index 8c1c89feb024..d0d6f6183670 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
@@ -125,9 +125,7 @@ public class QuickStatusBarHeader extends RelativeLayout {
}
public void updateEverything() {
- post(() -> {
- setClickable(false);
- });
+ post(() -> setClickable(false));
}
public void setQSPanel(final QSPanel qsPanel) {