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

Commit 77f14bd0 authored by Patrick Scott's avatar Patrick Scott
Browse files

Implement EXTRA_SKIP_UI. 

Change SetAlarm to take an alarm object instead of just the id.  Have
HandleSetAlarm pass the new Alarm object to the activity if EXTRA_SKIP_UI is
false.

Update TestAddAlarm to toggle the UI.

Bumped version number.

Bug: 3284120
Change-Id: Ie84ac8e3d7a63bfd64e40c626e577ce8b1f371b9
parent bed2fe9b

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.deskclock"

        android:versionCode="202" android:versionName="2.0.2">

        android:versionCode="203" android:versionName="2.0.3">



    <original-package android:name="com.android.alarmclock" />

    <original-package android:name="com.android.deskclock" />

src/com/android/deskclock/AlarmAlertFullScreen.java

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class AlarmAlertFullScreen extends Activity { 
        // Notify the user that the alarm has been snoozed.

        Intent cancelSnooze = new Intent(this, AlarmReceiver.class);

        cancelSnooze.setAction(Alarms.CANCEL_SNOOZE);

        cancelSnooze.putExtra(Alarms.ALARM_ID, mAlarm.id);

        cancelSnooze.putExtra(Alarms.ALARM_INTENT_EXTRA, mAlarm);

        PendingIntent broadcast =

                PendingIntent.getBroadcast(this, mAlarm.id, cancelSnooze, 0);

        NotificationManager nm = getNotificationManager();

src/com/android/deskclock/AlarmClock.java

+14 −5
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public class AlarmClock extends Activity implements OnItemClickListener { 
            return super.onContextItemSelected(item);

        }

        switch (item.getItemId()) {

            case R.id.delete_alarm:

            case R.id.delete_alarm: {

                // Confirm that the alarm will be deleted.

                new AlertDialog.Builder(this)

                        .setTitle(getString(R.string.delete_alarm))
@@ -174,8 +174,9 @@ public class AlarmClock extends Activity implements OnItemClickListener { 
                        .setNegativeButton(android.R.string.cancel, null)

                        .show();

                return true;

            }



            case R.id.enable_alarm:

            case R.id.enable_alarm: {

                final Cursor c = (Cursor) mAlarmsList.getAdapter()

                        .getItem(info.position);

                final Alarm alarm = new Alarm(c);
@@ -185,12 +186,17 @@ public class AlarmClock extends Activity implements OnItemClickListener { 
                            alarm.daysOfWeek);

                }

                return true;

            }



            case R.id.edit_alarm:

            case R.id.edit_alarm: {

                final Cursor c = (Cursor) mAlarmsList.getAdapter()

                        .getItem(info.position);

                final Alarm alarm = new Alarm(c);

                Intent intent = new Intent(this, SetAlarm.class);

                intent.putExtra(Alarms.ALARM_ID, id);

                intent.putExtra(Alarms.ALARM_INTENT_EXTRA, alarm);

                startActivity(intent);

                return true;

            }



            default:

                break;
@@ -309,8 +315,11 @@ public class AlarmClock extends Activity implements OnItemClickListener { 
    }



    public void onItemClick(AdapterView parent, View v, int pos, long id) {

        final Cursor c = (Cursor) mAlarmsList.getAdapter()

                .getItem(pos);

        final Alarm alarm = new Alarm(c);

        Intent intent = new Intent(this, SetAlarm.class);

        intent.putExtra(Alarms.ALARM_ID, (int) id);

        intent.putExtra(Alarms.ALARM_INTENT_EXTRA, alarm);

        startActivity(intent);

    }

}

src/com/android/deskclock/AlarmReceiver.java

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ public class AlarmReceiver extends BroadcastReceiver { 


        // Launch SetAlarm when clicked.

        Intent viewAlarm = new Intent(context, SetAlarm.class);

        viewAlarm.putExtra(Alarms.ALARM_ID, alarm.id);

        viewAlarm.putExtra(Alarms.ALARM_INTENT_EXTRA, alarm);

        PendingIntent intent =

                PendingIntent.getActivity(context, alarm.id, viewAlarm, 0);

src/com/android/deskclock/Alarms.java

+0 −4
Original line number Diff line number Diff line
@@ -80,10 +80,6 @@ public class Alarms { 
    // the Intent extras.

    public static final String ALARM_RAW_DATA = "intent.extra.alarm_raw";



    // This string is used to identify the alarm id passed to SetAlarm from the

    // list of alarms.

    public static final String ALARM_ID = "alarm_id";



    final static String PREF_SNOOZE_ID = "snooze_id";

    final static String PREF_SNOOZE_TIME = "snooze_time";