Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1967ba97 authored May 03, 2019 by Fabian Kozynski Committed by android-build-merger May 03, 2019

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

am: 330279c7

Change-Id: I6dc0faf906c4b57531632fbc68fe927cac98698e

parents 889d943b 330279c7

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ public class QSCarrierGroup extends LinearLayout implements

		@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

+2 −2

Original line number	Diff line number	Diff line
		@@ -524,7 +524,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements
		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 @@ public class QuickStatusBarHeader extends RelativeLayout implements
		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);
		}