diff options
| author | Daniel Sandler <dsandler@google.com> | 2010-01-19 22:50:37 -0500 |
|---|---|---|
| committer | Daniel Sandler <dsandler@google.com> | 2010-01-20 10:14:56 -0500 |
| commit | 9fa4cc96ece43fdc6873fdafb8c8f6b3ea0cc1fd (patch) | |
| tree | c96d4ff4e36151643ae87316b10ea45cc1578d42 | |
| parent | 6e37178770f41ffcf8013e9460170140bcc6c130 (diff) | |
| download | android_packages_apps_DeskClock-9fa4cc96ece43fdc6873fdafb8c8f6b3ea0cc1fd.tar.gz android_packages_apps_DeskClock-9fa4cc96ece43fdc6873fdafb8c8f6b3ea0cc1fd.tar.bz2 android_packages_apps_DeskClock-9fa4cc96ece43fdc6873fdafb8c8f6b3ea0cc1fd.zip | |
Add Dock Settings menu item to DeskClock.
Bug: 2367275
| -rw-r--r-- | res/menu/desk_clock_menu.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/deskclock/DeskClock.java | 22 |
3 files changed, 20 insertions, 7 deletions
diff --git a/res/menu/desk_clock_menu.xml b/res/menu/desk_clock_menu.xml index c800642f3..d31d65b28 100644 --- 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 1cf4057c8..61e829c1e 100644 --- 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 3b3ce44f1..de96e9b9a 100644 --- 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 |