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

Commit 6d89df09 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix alarm text in QSHeader to use PendingIntent" into qt-dev am:... 

Merge "Merge "Fix alarm text in QSHeader to use PendingIntent" into qt-dev am: c61a2510" into qt-dev-plus-aosp
parents 4db03639 972a828c

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

+4 −3
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.provider.Settings; 
import android.service.notification.ZenModeConfig;

import android.text.format.DateUtils;

import android.util.AttributeSet;

import android.util.Log;

import android.util.Pair;

import android.util.StatsLog;

import android.view.ContextThemeWrapper;
@@ -524,11 +525,11 @@ public class QuickStatusBarHeader extends RelativeLayout implements 
            mActivityStarter.postStartActivityDismissingKeyguard(new Intent(

                    AlarmClock.ACTION_SHOW_ALARMS), 0);

        } else if (v == mNextAlarmContainer) {

            if (mNextAlarm.getShowIntent() != null

                    && mNextAlarm.getShowIntent().getIntent() != null) {

            if (mNextAlarm.getShowIntent() != null) {

                mActivityStarter.postStartActivityDismissingKeyguard(

                        mNextAlarm.getShowIntent().getIntent(), 0);

                        mNextAlarm.getShowIntent());

            } else {

                Log.d(TAG, "No PendingIntent for next alarm. Using default intent");

                mActivityStarter.postStartActivityDismissingKeyguard(new Intent(

                        AlarmClock.ACTION_SHOW_ALARMS), 0);

            }