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

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java b/packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
index 3a93d51..63563b2 100644 (file)
--- 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 8c1c89f..d0d6f61 100644 (file)
--- 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) {