summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-06-12 18:37:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-12 18:37:34 +0000
commita6f8f8b3d9dab80e3677b6452f3c03d7941b93ba (patch)
tree905953730995bc8a95b8a226339c998bbf86ff8b /res/xml
parent63328dedb410f9b0668f27960de575c8b70afcb4 (diff)
parent26ac83df5922430b7d7e3eee46c36c7d856bc47c (diff)
downloadpackages_apps_Settings-a6f8f8b3d9dab80e3677b6452f3c03d7941b93ba.tar.gz
packages_apps_Settings-a6f8f8b3d9dab80e3677b6452f3c03d7941b93ba.tar.bz2
packages_apps_Settings-a6f8f8b3d9dab80e3677b6452f3c03d7941b93ba.zip
am 26ac83df: Merge "Settings: Remove master swtich from battery saver." into lmp-preview-dev
* commit '26ac83df5922430b7d7e3eee46c36c7d856bc47c': Settings: Remove master swtich from battery saver.
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/battery_saver_settings.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index a3729c50b..472586af2 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -18,6 +18,14 @@
android:title="@string/battery_saver"
android:key="battery_saver">
+ <!-- Always on -->
+ <SwitchPreference
+ android:key="always_on"
+ android:title="@string/battery_saver_always_on_title"
+ android:switchTextOff=""
+ android:switchTextOn=""
+ android:persistent="false" />
+
<!-- Turn on automatically -->
<com.android.settings.notification.DropDownPreference
android:key="turn_on_automatically"