diff options
| author | DvTonder <david.vantonder@gmail.com> | 2013-06-05 04:33:14 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-06-05 04:33:15 -0700 |
| commit | 46545ec744e6521b782319471f617321b52a6388 (patch) | |
| tree | ed1a14f96fedaffe2dc58d82bf93c5ff821df290 /res | |
| parent | c1963d093c7ab485108af46f7f224b66b238adce (diff) | |
| parent | 0724c8c742a3641f14eb143d0cf7fb8e90f8d8bb (diff) | |
| download | packages_apps_Settings-46545ec744e6521b782319471f617321b52a6388.zip packages_apps_Settings-46545ec744e6521b782319471f617321b52a6388.tar.gz packages_apps_Settings-46545ec744e6521b782319471f617321b52a6388.tar.bz2 | |
Merge "Settings: Add support to enable/disable Electron Beam (2/2)" into cm-10.1
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/cm_strings.xml | 5 | ||||
| -rw-r--r-- | res/xml/display_settings.xml | 19 |
2 files changed, 18 insertions, 6 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index c377490..80ca939 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -940,4 +940,9 @@ two in order to insert additional control points. \'Remove\' deletes the selecte <string name="power_notifications_ringtone_title">Notification sound</string> <!-- Sound settings, power notifications label for ringtone == none --> <string name="power_notifications_ringtone_silent">Silent</string> + + <!-- Display Screen-on and off Electron beam animations --> + <string name="screen_off_animation_title">Screen-off animation</string> + <string name="screen_off_animation_summary">Show the electron beam animation when the screen is turned off</string> + </resources> diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index ed88399..b0b92d1 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -59,14 +59,21 @@ android:title="@string/wifi_display_settings_title" android:fragment="com.android.settings.wfd.WifiDisplaySettings" /> + <CheckBoxPreference + android:key="screen_off_animation" + android:title="@string/screen_off_animation_title" + android:summary="@string/screen_off_animation_summary" + android:defaultValue="true" /> + <PreferenceCategory android:key="category_wakeup_options" - android:title="@string/display_category_wakeup_options_title"/> + android:title="@string/display_category_wakeup_options_title" > - <CheckBoxPreference - android:key="pref_volume_wake" - android:title="@string/pref_volume_wake_title" - android:summary="@string/pref_volume_wake_summary" - android:defaultValue="false" /> + <CheckBoxPreference + android:key="pref_volume_wake" + android:title="@string/pref_volume_wake_title" + android:summary="@string/pref_volume_wake_summary" + android:defaultValue="false" /> + </PreferenceCategory> </PreferenceScreen> |