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

Commit ddacabc2 authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Add "add alarm" menu to the DeskClock activity. 

Rather than copying code from AlarmClock, there is now a
version of addNewAlarm() that can be invoked from any
activity. (AlarmClock now uses it, along with DeskClock.)

Part of bug http://b/2278197 .
parent aa378715

res/drawable-hdpi/ic_menu_alarms.png

0 → 100644
+3 KiB
Loading image diff...

res/drawable-mdpi/ic_menu_alarms.png

0 → 100644
+1.92 KiB
Loading image diff...

res/menu/desk_clock_menu.xml

+5 −1
Original line number Diff line number Diff line
@@ -16,7 +16,11 @@ 


<menu xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:id="@+id/menu_item_alarms"

        android:title="@string/alarm_list_title"/>

        android:title="@string/alarm_list_title"

        android:icon="@drawable/ic_menu_alarms"/>

    <item android:id="@+id/menu_item_add_alarm"

        android:title="@string/add_alarm"

        android:icon="@drawable/ic_menu_add"/>

</menu>

src/com/android/deskclock/AlarmClock.java

+10 −5
Original line number Diff line number Diff line
@@ -240,16 +240,21 @@ public class AlarmClock extends Activity implements OnItemClickListener { 
        });

    }



    private void addNewAlarm() {

        Uri uri = Alarms.addAlarm(getContentResolver());

        String segment = uri.getPathSegments().get(1);

    // Version of addNewAlarm that can be called from any activity, e.g. DeskClock

    protected static void addNewAlarm(Context context) {

        final Uri uri = Alarms.addAlarm(context.getContentResolver());

        final String segment = uri.getPathSegments().get(1);

        int newId = Integer.parseInt(segment);

        if (Log.LOGV) {

            Log.v("In AlarmClock, new alarm id = " + newId);

        }

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

        final Intent intent = new Intent(context, SetAlarm.class);

        intent.putExtra(Alarms.ALARM_ID, newId);

        startActivity(intent);

        context.startActivity(intent);

    }



    private void addNewAlarm() {

        addNewAlarm(this);

    }



    @Override

src/com/android/deskclock/DeskClock.java

+3 −0
Original line number Diff line number Diff line
@@ -708,6 +708,9 @@ public class DeskClock extends Activity { 
        if (item.getItemId() == R.id.menu_item_alarms) {

            startActivity(new Intent(DeskClock.this, AlarmClock.class));

            return true;

        } else if (item.getItemId() == R.id.menu_item_add_alarm) {

            AlarmClock.addNewAlarm(this);

            return true;

        }

        return false;

    }