summaryrefslogtreecommitdiffstats
path: root/src/com/android
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 /src/com/android
parentc72b4659ae29aa89f3dc2990995b0638fe28ce4f (diff)
downloadpackages_apps_Settings-5599680aa5c84f00a0ee148186e66e2476ce6184.tar.gz
packages_apps_Settings-5599680aa5c84f00a0ee148186e66e2476ce6184.tar.bz2
packages_apps_Settings-5599680aa5c84f00a0ee148186e66e2476ce6184.zip
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 'src/com/android')
-rw-r--r--src/com/android/settings/SecuritySettings.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 63378009e..35451d73c 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -125,6 +125,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
private static final String KEY_SMS_SECURITY_CHECK_PREF = "sms_security_check_limit";
private static final String KEY_GENERAL_CATEGORY = "general_category";
private static final String KEY_LIVE_LOCK_SCREEN = "live_lock_screen";
+ private static final String KEY_LOCK_SCREEN_BLUR = CMSettings.Secure.LOCK_SCREEN_BLUR_ENABLED;
// These switch preferences need special handling since they're not all stored in Settings.
private static final String SWITCH_PREFERENCE_KEYS[] = { KEY_LOCK_AFTER_TIMEOUT,
@@ -359,6 +360,14 @@ public class SecuritySettings extends SettingsPreferenceFragment
setLiveLockScreenPreferenceTitleAndSummary(liveLockPreference);
groupToAddTo.addPreference(liveLockPreference);
}
+
+ // only show blur setting for devices that support it
+ boolean blurSupported = getResources().getBoolean(
+ com.android.internal.R.bool.config_ui_blur_enabled);
+ if (!blurSupported) {
+ Preference blurEnabledPref = root.findPreference(KEY_LOCK_SCREEN_BLUR);
+ if (blurEnabledPref != null) root.removePreference(blurEnabledPref);
+ }
}
if (securityOrExternal) {