Add Dock Settings menu item to DeskClock.

Bug: 2367275

diff --git a/res/menu/desk_clock_menu.xml b/res/menu/desk_clock_menu.xml
index c800642..d31d65b 100644 (file)
--- a/res/menu/desk_clock_menu.xml
+++ b/res/menu/desk_clock_menu.xml
@@ -21,6 +21,9 @@
     <item android:id="@+id/menu_item_add_alarm"
         android:title="@string/add_alarm"
         android:icon="@drawable/ic_menu_add"/>
+    <item android:id="@+id/menu_item_dock_settings"
+        android:title="@string/menu_item_dock_settings"
+        android:icon="@android:drawable/ic_menu_preferences"/>
 </menu>
 
 

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1cf4057..61e829c 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -246,6 +246,8 @@
          respond. This is a sign of an error; if the weather widget is not
          present on the device, we show nothing at all. -->
     <string name="weather_fetch_failure">Weather information currently unavailable.</string>
+
+    <string name="menu_item_dock_settings">Dock settings</string>
 </resources>
 
 

diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index 3b3ce44..de96e9b 100644 (file)
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -94,6 +94,9 @@ public class DeskClock extends Activity {
     // Alarm action for midnight (so we can update the date display).
     private static final String ACTION_MIDNIGHT = "com.android.deskclock.MIDNIGHT";
 
+    // Intent to broadcast for dock settings.
+    private static final String DOCK_SETTINGS_ACTION = "com.android.settings.DOCK_SETTINGS";
+
     // Interval between polls of the weather widget. Its refresh period is
     // likely to be much longer (~3h), but we want to pick up any changes
     // within 5 minutes.
@@ -757,14 +760,19 @@ public class DeskClock extends Activity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        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;
+        switch (item.getItemId()) {
+            case R.id.menu_item_alarms:
+                startActivity(new Intent(DeskClock.this, AlarmClock.class));
+                return true;
+            case R.id.menu_item_add_alarm:
+                AlarmClock.addNewAlarm(this);
+                return true;
+            case R.id.menu_item_dock_settings:
+                startActivity(new Intent(DOCK_SETTINGS_ACTION));
+                return true;
+            default:
+                return false;
         }
-        return false;
     }
 
     @Override