UI tweaks to meet Jeff's spec.

[android-x86/packages-apps-DeskClock.git] / src / com / android / deskclock / AlarmClock.java

diff --git a/src/com/android/deskclock/AlarmClock.java b/src/com/android/deskclock/AlarmClock.java
index acf42b3..e872ead 100644 (file)
--- a/src/com/android/deskclock/AlarmClock.java
+++ b/src/com/android/deskclock/AlarmClock.java
@@ -192,6 +192,12 @@ public class AlarmClock extends Activity implements OnItemClickListener {
                 }
                 return true;
 
+            case R.id.edit_alarm:
+                Intent intent = new Intent(this, SetAlarm.class);
+                intent.putExtra(Alarms.ALARM_ID, id);
+                startActivity(intent);
+                return true;
+
             default:
                 break;
         }
@@ -221,17 +227,7 @@ public class AlarmClock extends Activity implements OnItemClickListener {
         View addAlarm = findViewById(R.id.add_alarm);
         addAlarm.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View v) {
-                    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(AlarmClock.this, SetAlarm.class);
-                    intent.putExtra(Alarms.ALARM_ID, newId);
-                    startActivity(intent);
+                    addNewAlarm();
                 }
             });
 
@@ -244,6 +240,18 @@ public class AlarmClock extends Activity implements OnItemClickListener {
         });
     }
 
+    private void addNewAlarm() {
+        Uri uri = Alarms.addAlarm(getContentResolver());
+        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.ALARM_ID, newId);
+        startActivity(intent);
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -278,25 +286,30 @@ public class AlarmClock extends Activity implements OnItemClickListener {
 
         // Set the custom view on the menu.
         menu.setHeaderView(v);
-        // Change the text to "disable" if the alarm is already enabled.
-        if (alarm.enabled) {
-            menu.findItem(R.id.enable_alarm).setTitle(R.string.disable_alarm);
-        }
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.menu_item_settings) {
-            startActivity(new Intent(this, SettingsActivity.class));
-            return true;
+        switch (item.getItemId()) {
+            case R.id.menu_item_settings:
+                startActivity(new Intent(this, SettingsActivity.class));
+                return true;
+            case R.id.menu_item_desk_clock:
+                startActivity(new Intent(this, DeskClock.class));
+                return true;
+            case R.id.menu_item_add_alarm:
+                addNewAlarm();
+                return true;
+            default:
+                break;
         }
-        return false;
+        return super.onOptionsItemSelected(item);
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.alarm_list_menu, menu);
-        return true;
+        return super.onCreateOptionsMenu(menu);
     }
 
     public void onItemClick(AdapterView parent, View v, int pos, long id) {