diff options
| author | Artem Chep <artemchep@gmail.com> | 2013-01-08 10:36:33 -0500 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-08-24 08:06:57 -0600 |
| commit | 59d1062e8cd7ef514feffb3925f82b29c5101f6b (patch) | |
| tree | 8768e6b76ec9249b69f63d032011da36df094a44 /res | |
| parent | 1cc3728ba7a99c66dab2662469d2f85b2d71ead2 (diff) | |
| download | android_packages_apps_DeskClock-59d1062e8cd7ef514feffb3925f82b29c5101f6b.tar.gz android_packages_apps_DeskClock-59d1062e8cd7ef514feffb3925f82b29c5101f6b.tar.bz2 android_packages_apps_DeskClock-59d1062e8cd7ef514feffb3925f82b29c5101f6b.zip | |
DeskClock: Add back flip and shake actions
Cherry-picked and ported from:
* http://review.cyanogenmod.org/#/c/29894/
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Conflicts:
res/xml/settings.xml
src/com/android/deskclock/SettingsActivity.java
src/com/android/deskclock/alarms/AlarmService.java
CRs-Fixed: 1014635
Change-Id: I9be82187559ccd483b8e4da068890f532e60b8f7
Diffstat (limited to 'res')
| -rw-r--r-- | res/xml/settings.xml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 4baddc8de..405ab4ae9 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -48,6 +48,7 @@ <PreferenceCategory android:title="@string/alarm_settings"> + <ListPreference android:key="auto_silence" android:title="@string/auto_silence_title" @@ -79,6 +80,21 @@ android:defaultValue="0" /> <ListPreference + android:key="flip_action" + android:title="@string/flip_action_title" + android:dialogTitle="@string/flip_action_dialog_title" + android:entries="@array/action_summary_entries" + android:entryValues="@array/action_summary_values" + android:defaultValue="0" /> + + <ListPreference + android:key="shake_action" + android:title="@string/shake_action_title" + android:dialogTitle="@string/shake_action_dialog_title" + android:entries="@array/action_summary_entries" + android:entryValues="@array/action_summary_values" + android:defaultValue="0"/> + <ListPreference android:key="week_start" android:title="@string/week_start_title" android:dialogTitle="@string/week_start_title" |