summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2016-05-10 09:25:31 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-05-20 18:59:45 -0700
commit5599680aa5c84f00a0ee148186e66e2476ce6184 (patch)
treeb0fa959d0aad1fe62cb8c1856cdd9122d6844386 /res
parentc72b4659ae29aa89f3dc2990995b0638fe28ce4f (diff)
downloadpackages_apps_Settings-5599680aa5c84f00a0ee148186e66e2476ce6184.zip
packages_apps_Settings-5599680aa5c84f00a0ee148186e66e2476ce6184.tar.gz
packages_apps_Settings-5599680aa5c84f00a0ee148186e66e2476ce6184.tar.bz2
Give user control over lock screen blur
This will provide control over blurring since the current implementation assumes it is always on provided the device config specifies it supports blur. Change-Id: I7add45c607fcf47777d61629a3fc6245ffedb339
Diffstat (limited to 'res')
-rw-r--r--res/values/cm_strings.xml3
-rw-r--r--res/xml/security_settings_chooser.xml5
-rw-r--r--res/xml/security_settings_password.xml5
-rw-r--r--res/xml/security_settings_pattern.xml5
-rw-r--r--res/xml/security_settings_pin.xml5
5 files changed, 23 insertions, 0 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 27ca707..c02a8f8 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1213,4 +1213,7 @@
<!-- Label for settings shortcut: carrier selection -->
<string name="shortcut_carrier_title">Network operators</string>
+
+ <!-- title for lock screen blur preference -->
+ <string name="lockscreen_blur_enabled_title">Lock screen blur</string>
</resources>
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index a097abf..cad2534 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -51,6 +51,11 @@
android:title="@string/lockscreen_visualizer_title"
android:defaultValue="true"/>
+ <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+ android:key="lock_screen_blur_enabled"
+ android:title="@string/lockscreen_blur_enabled_title"
+ android:defaultValue="true"/>
+
</PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index 680a579..f926378 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -77,6 +77,11 @@
android:title="@string/lockscreen_visualizer_title"
android:defaultValue="true"/>
+ <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+ android:key="lock_screen_blur_enabled"
+ android:title="@string/lockscreen_blur_enabled_title"
+ android:defaultValue="true"/>
+
</PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 2576ea7..1e04839 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -93,6 +93,11 @@
android:title="@string/lockscreen_visualizer_title"
android:defaultValue="true"/>
+ <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+ android:key="lock_screen_blur_enabled"
+ android:title="@string/lockscreen_blur_enabled_title"
+ android:defaultValue="true"/>
+
</PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index a378ef9..c5d849d 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -82,6 +82,11 @@
android:title="@string/lockscreen_visualizer_title"
android:defaultValue="true"/>
+ <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+ android:key="lock_screen_blur_enabled"
+ android:title="@string/lockscreen_blur_enabled_title"
+ android:defaultValue="true"/>
+
</PreferenceCategory>
</PreferenceScreen>