commit ddacabc24b515db4fa6c7a289ef81d8050c8062c
author Daniel Sandler <dsandler@google.com> Mon Nov 23 11:37:05 2009 -0500
committer Daniel Sandler <dsandler@google.com> Mon Nov 23 11:37:05 2009 -0500
tree b31462ece601b94350346a056356ac85adca2d9f
parent aa378715cf7b99264517250ac196c0fec7999d44

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 .

res/drawable-hdpi/ic_menu_alarms.png

diff --git a/res/drawable-hdpi/ic_menu_alarms.png b/res/drawable-hdpi/ic_menu_alarms.png
new file mode 100644
index 0000000..db27521
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_alarms.png
Binary files differ

res/drawable-mdpi/ic_menu_alarms.png

diff --git a/res/drawable-mdpi/ic_menu_alarms.png b/res/drawable-mdpi/ic_menu_alarms.png
new file mode 100644
index 0000000..e7a5bd1
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_alarms.png
Binary files differ

res/menu/desk_clock_menu.xml

diff --git a/res/menu/desk_clock_menu.xml b/res/menu/desk_clock_menu.xml
index 8d0c4ae..c800642 100644
--- a/res/menu/desk_clock_menu.xml
+++ b/res/menu/desk_clock_menu.xml
@@ -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

diff --git a/src/com/android/deskclock/AlarmClock.java b/src/com/android/deskclock/AlarmClock.java
index e872ead..4e4db18 100644
--- a/src/com/android/deskclock/AlarmClock.java
+++ b/src/com/android/deskclock/AlarmClock.java
@@ -240,16 +240,21 @@
         });
     }
 
-    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

diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index 0cd65a5..625f03f 100644
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -708,6 +708,9 @@
         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;
     }