commit 1967ba97a6cf37fb50dc162cbae3b88ac30ba25a
author Fabian Kozynski <kozynski@google.com> Fri May 03 07:21:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 03 07:21:00 2019 -0700
tree d085d551990e6a78288e597117a42fec19f531b1
parent 889d943b900c69b6f9a52a528d0f38752c222275
parent 330279c7f14ac5cd0d6035944adc428b36811029

Merge "Prevents QS Header info clicks when it's hidden" into qt-dev
am: 330279c7f1

Change-Id: I6dc0faf906c4b57531632fbc68fe927cac98698e

packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroup.java

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroup.java b/packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroup.java
index e352b58..4571ef3 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroup.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSCarrierGroup.java
@@ -77,6 +77,7 @@
 
     @Override
     public void onClick(View v) {
+        if (!v.isVisibleToUser()) return;
         mActivityStarter.postStartActivityDismissingKeyguard(new Intent(
                 Settings.ACTION_WIRELESS_SETTINGS), 0);
     }

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
index 9431f20..42c616c 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
@@ -524,7 +524,7 @@
         if (v == mClockView) {
             mActivityStarter.postStartActivityDismissingKeyguard(new Intent(
                     AlarmClock.ACTION_SHOW_ALARMS), 0);
-        } else if (v == mNextAlarmContainer) {
+        } else if (v == mNextAlarmContainer && mNextAlarmContainer.isVisibleToUser()) {
             if (mNextAlarm.getShowIntent() != null) {
                 mActivityStarter.postStartActivityDismissingKeyguard(
                         mNextAlarm.getShowIntent());
@@ -545,7 +545,7 @@
                         new Intent(Intent.ACTION_REVIEW_ONGOING_PERMISSION_USAGE), 0);
                 mHost.collapsePanels();
             });
-        } else if (v == mRingerContainer) {
+        } else if (v == mRingerContainer && mRingerContainer.isVisibleToUser()) {
             mActivityStarter.postStartActivityDismissingKeyguard(new Intent(
                     Settings.ACTION_SOUND_SETTINGS), 0);
         }