commit 2a837190a9e51c5797800074cc5d5d4e0a32c126
author Lifu Tang <lifu@google.com> Tue Mar 24 23:48:06 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 24 23:48:07 2015 +0000
tree 1dcab1ea05dbd70f8dbc165cd1e054dbc2750566
parent a45047928532c0a50205237f294c561815f4f63b
parent cb193d55e17fc7cfdb195eea9b6c4b4c7af66b4b

Merge "Added a screen to configure wireless scanning"

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index fc3ed0a..4c13e4a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -767,7 +767,7 @@
     <!-- Introduction detail message shown in fingerprint enrollment dialog -->
     <string name="security_settings_fingerprint_enroll_onboard_message">
         To use your fingerprint to unlock your screen or confirm purchases, we\'ll need to:
-        \n\n\u2713 Set up your background screen lock method
+        \n\n\u2713 Set up your backup screen lock method
         \n\n\u2713 Add your fingerprint</string>
     <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_find_sensor_title">Find the sensor</string>

src/com/android/settings/FingerprintSettings.java

diff --git a/src/com/android/settings/FingerprintSettings.java b/src/com/android/settings/FingerprintSettings.java
index e7443e3..dbc4db7 100644
--- a/src/com/android/settings/FingerprintSettings.java
+++ b/src/com/android/settings/FingerprintSettings.java
@@ -69,7 +69,7 @@
     public static class FingerprintSettingsFragment extends SettingsPreferenceFragment
         implements OnPreferenceChangeListener, Indexable {
         private static final String TAG = "FingerprintSettings";
-        private static final String KEY_FINGERPRINT_ITEM = "key_fingerprint_item";
+        private static final String KEY_FINGERPRINT_ITEM_PREFIX = "key_fingerprint_item";
         private static final String KEY_USAGE_CATEGORY = "fingerprint_usage_category";
         private static final String KEY_FINGERPRINT_ADD = "key_fingerprint_add";
         private static final String KEY_MANAGE_CATEGORY = "fingerprint_manage_category";
@@ -202,7 +202,7 @@
         }
 
         private static String genKey(int id) {
-            return KEY_FINGERPRINT_ITEM + "_" + id;
+            return KEY_FINGERPRINT_ITEM_PREFIX + "_" + id;
         }
 
         @Override