Automated import from //branches/master/...@141978,141978

diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
new file mode 100644 (file)
index 0000000..5821195
--- /dev/null
+++ b/res/menu/main_menu.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/menu_add_alarm"
+        android:title="@string/add_alarm"
+        android:icon="@android:drawable/ic_menu_add"/>
+    <item android:id="@+id/menu_toggle_clock"
+        android:title="@string/hide_clock"
+        android:icon="@drawable/ic_menu_clock_face"/>
+    <item android:id="@+id/menu_settings"
+        android:title="@string/settings"
+        android:icon="@android:drawable/ic_menu_preferences"/>
+</menu>
+
+

diff --git a/src/com/android/alarmclock/AlarmClock.java b/src/com/android/alarmclock/AlarmClock.java
index f8902b9..06ff42c 100644 (file)
--- a/src/com/android/alarmclock/AlarmClock.java
+++ b/src/com/android/alarmclock/AlarmClock.java
@@ -48,7 +48,6 @@ import java.util.Calendar;
 public class AlarmClock extends Activity {
 
     final static String PREFERENCES = "AlarmClock";
-    final static int SET_ALARM = 1;
     final static String PREF_CLOCK_FACE = "face";
     final static String PREF_SHOW_CLOCK = "show_clock";
 
@@ -129,7 +128,7 @@ public class AlarmClock extends Activity {
                         if (true) {
                             Intent intent = new Intent(AlarmClock.this, SetAlarm.class);
                             intent.putExtra(Alarms.ID, id);
-                            startActivityForResult(intent, SET_ALARM);
+                            startActivity(intent);
                         } else {
                             // TESTING: immediately pop alarm
                             Intent fireAlarm = new Intent(AlarmClock.this, AlarmAlert.class);
@@ -274,19 +273,10 @@ public class AlarmClock extends Activity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
+        // Inflate our menu.
+        getMenuInflater().inflate(R.menu.main_menu, menu);
 
-        mAddAlarmItem = menu.add(0, 0, 0, R.string.add_alarm);
-        mAddAlarmItem.setIcon(android.R.drawable.ic_menu_add);
-
-        mToggleClockItem = menu.add(0, 0, 0, R.string.hide_clock);
-        mToggleClockItem.setIcon(R.drawable.ic_menu_clock_face);
-        
-        MenuItem settingsItem = menu.add(0, 0, 0, R.string.settings);
-        settingsItem.setIcon(android.R.drawable.ic_menu_preferences);
-        settingsItem.setIntent(new Intent(this, SettingsActivity.class));
-
-        return true;
+        return super.onCreateOptionsMenu(menu);
     }
 
     /**
@@ -295,32 +285,41 @@ public class AlarmClock extends Activity {
      */
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
-        mAddAlarmItem.setVisible(mAlarmsList.getChildCount() < MAX_ALARM_COUNT);
-        mToggleClockItem.setTitle(getClockVisibility() ? R.string.hide_clock :
-                                  R.string.show_clock);
-        return true;
+        menu.findItem(R.id.menu_add_alarm).setVisible(
+                mAlarmsList.getAdapter().getCount() < MAX_ALARM_COUNT);
+        menu.findItem(R.id.menu_toggle_clock).setTitle(
+                getClockVisibility() ? R.string.hide_clock
+                    : R.string.show_clock);
+        return super.onPrepareOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item == mAddAlarmItem) {
-            Uri uri = Alarms.addAlarm(getContentResolver());
-            // FIXME: scroll to new item.  mAlarmsList.requestChildRectangleOnScreen() ?
-            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(AlarmClock.this, SetAlarm.class);
-            intent.putExtra(Alarms.ID, newId);
-            startActivityForResult(intent, SET_ALARM);
-            return true;
-        } else if (item == mToggleClockItem) {
-            setClockVisibility(!getClockVisibility());
-            saveClockVisibility();
-            return true;
+        switch (item.getItemId()) {
+            case R.id.menu_add_alarm:
+                Uri uri = Alarms.addAlarm(getContentResolver());
+                // FIXME: scroll to new item?
+                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);
+                intent.putExtra(Alarms.ID, newId);
+                startActivity(intent);
+                return true;
+
+            case R.id.menu_toggle_clock:
+                setClockVisibility(!getClockVisibility());
+                saveClockVisibility();
+                return true;
+
+            case R.id.menu_settings:
+                startActivity(new Intent(this, SettingsActivity.class));
+                return true;
         }
 
-        return false;
+        return super.onOptionsItemSelected(item);
     }