summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-09-19 00:59:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-19 00:59:51 +0000
commitd251fed3ef24b02697a375bf32f382338f500f53 (patch)
treef8b3af2a17628f9768851e9f2ea1e3e7eb008ce3 /src
parentc6a96d4076ecddce57c864683a47e581ca2517f5 (diff)
parentd433359684386fc238bd4a2b45b67d991af07deb (diff)
downloadpackages_apps_Settings-d251fed3ef24b02697a375bf32f382338f500f53.zip
packages_apps_Settings-d251fed3ef24b02697a375bf32f382338f500f53.tar.gz
packages_apps_Settings-d251fed3ef24b02697a375bf32f382338f500f53.tar.bz2
Merge "Add summary for 0 fingerprint settings preference" into mnc-dr-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/SecuritySettings.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 6e679b6..840a393 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -361,6 +361,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
fingerprintCount, fingerprintCount));
clazz = FingerprintSettings.class.getName();
} else {
+ fingerprintPreference.setSummary(
+ R.string.security_settings_fingerprint_preference_summary_none);
clazz = FingerprintEnrollIntroduction.class.getName();
}
intent.setClassName("com.android.settings", clazz);