From f3db35c4c969bf0a480597ed058aeeb23b5a6bad Mon Sep 17 00:00:00 2001 From: Fabian Kozynski Date: Wed, 24 Apr 2019 14:37:35 -0400 Subject: [PATCH] Fix intent for next alarm Clicking on next alarm will send the user to the app that sets the alarm, using their PendingIntent Test: manual using default clock and 3rd party clock Fixes: 130977970 Bug: 129350749 Change-Id: I4c1be9fe9ea60787ecb2b863e7463d827aef0075 --- .../android/systemui/qs/QuickStatusBarHeader.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java index 2e3065aeee039..f6f4f260dbe74 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java @@ -555,9 +555,18 @@ public class QuickStatusBarHeader extends RelativeLayout implements @Override public void onClick(View v) { - if (v == mClockView || v == mNextAlarmContainer) { + if (v == mClockView) { mActivityStarter.postStartActivityDismissingKeyguard(new Intent( - AlarmClock.ACTION_SHOW_ALARMS),0); + AlarmClock.ACTION_SHOW_ALARMS), 0); + } else if (v == mNextAlarmContainer) { + if (mNextAlarm.getShowIntent() != null + && mNextAlarm.getShowIntent().getIntent() != null) { + mActivityStarter.postStartActivityDismissingKeyguard( + mNextAlarm.getShowIntent().getIntent(), 0); + } else { + mActivityStarter.postStartActivityDismissingKeyguard(new Intent( + AlarmClock.ACTION_SHOW_ALARMS), 0); + } } else if (v == mPrivacyChip) { // Makes sure that the builder is grabbed as soon as the chip is pressed PrivacyDialogBuilder builder = mPrivacyChip.getBuilder();