am 44d196db: am 4d52065d: am ddacabc2: Add "add alarm" menu to the DeskClock activity.

Merge commit '44d196dbe0da5b5c7a9628189d333b0c78ee8a59'

* commit '44d196dbe0da5b5c7a9628189d333b0c78ee8a59':
  Add "add alarm" menu to the DeskClock activity.

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

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

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

diff --git a/src/com/android/deskclock/AlarmClock.java b/src/com/android/deskclock/AlarmClock.java
index e3b9ce3..be30da5 100644 (file)
--- a/src/com/android/deskclock/AlarmClock.java
+++ b/src/com/android/deskclock/AlarmClock.java
@@ -238,16 +238,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

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