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

Commit ba27a4de authored by Justin Klaassen's avatar Justin Klaassen
Browse files

Fixes from merge of ab6a8e1f - DO NOT MERGE 

Bug: 30076796
Change-Id: I88f075b4c6fc95e54a92d11328e4258521c7054e
parent e6d48272

src/com/android/deskclock/HandleApiCalls.java

+0 −2
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ public class HandleApiCalls extends Activity { 
        @Override

        protected Void doInBackground(Void... parameters) {

            final ContentResolver cr = mContext.getContentResolver();



            final List<Alarm> alarms = getEnabledAlarms(mContext);

            if (alarms.isEmpty()) {

                final String reason = mContext.getString(R.string.no_scheduled_alarms);
@@ -248,7 +247,6 @@ public class HandleApiCalls extends Activity { 
        @Override

        protected Void doInBackground(Void... parameters) {

            final ContentResolver cr = mContext.getContentResolver();



            final List<AlarmInstance> alarmInstances = AlarmInstance.getInstancesByState(

                    cr, FIRED_STATE);

            if (alarmInstances.isEmpty()) {

src/com/android/deskclock/data/StopwatchModel.java

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ final class StopwatchModel { 
     * @return a newly recorded lap completed now; {@code null} if no more laps can be added

     */

    Lap addLap() {

        if (!canAddMoreLaps()) {

        if (!mStopwatch.isRunning() || !canAddMoreLaps()) {

            return null;

        }

src/com/android/deskclock/data/Timer.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public final class Timer { 


    static final long UNUSED = Long.MIN_VALUE;



    /** A unique identifier for the city. */

    /** A unique identifier for the timer. */

    private final int mId;



    /** The current state of the timer. */

src/com/android/deskclock/data/TimerNotificationBuilderN.java

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ class TimerNotificationBuilderN implements TimerModel.NotificationBuilder { 


        // Intent to load the app and show the timer when the notification is tapped.

        final Intent showApp = new Intent(context, TimerService.class)

                .setAction(TimerService.ACTION_SHOW_TIMERS)

                .setAction(TimerService.ACTION_SHOW_TIMER)

                .putExtra(TimerService.EXTRA_TIMER_ID, timer.getId())

                .putExtra(Events.EXTRA_EVENT_LABEL, R.string.label_notification);
@@ -291,7 +291,7 @@ class TimerNotificationBuilderN implements TimerModel.NotificationBuilder { 


        // Intent to load the app and show the timer when the notification is tapped.

        final Intent showApp = new Intent(context, TimerService.class)

                .setAction(TimerService.ACTION_SHOW_TIMERS)

                .setAction(TimerService.ACTION_SHOW_TIMER)

                .putExtra(TimerService.EXTRA_TIMER_ID, timer.getId())

                .putExtra(Events.EXTRA_EVENT_LABEL, R.string.label_notification);

src/com/android/deskclock/data/TimerNotificationBuilderPreN.java

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ class TimerNotificationBuilderPreN implements TimerModel.NotificationBuilder { 


        // Intent to load the app and show the timer when the notification is tapped.

        final Intent showApp = new Intent(context, TimerService.class)

                .setAction(TimerService.ACTION_SHOW_TIMERS)

                .setAction(TimerService.ACTION_SHOW_TIMER)

                .putExtra(TimerService.EXTRA_TIMER_ID, timer.getId())

                .putExtra(Events.EXTRA_EVENT_LABEL, R.string.label_notification);
@@ -279,7 +279,7 @@ class TimerNotificationBuilderPreN implements TimerModel.NotificationBuilder { 


        // Intent to load the app and show the timer when the notification is tapped.

        final Intent showApp = new Intent(context, TimerService.class)

                .setAction(TimerService.ACTION_SHOW_TIMERS)

                .setAction(TimerService.ACTION_SHOW_TIMER)

                .putExtra(TimerService.EXTRA_TIMER_ID, timer.getId())

                .putExtra(Events.EXTRA_EVENT_LABEL, R.string.label_notification);