PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash when removing fingerprint" into mnc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2015-05-14 22:12:38 +00:00
committed by Android (Google) Code Review
parent 3fc7bfd9d9 0dbeeda053
commit 68d208e903
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -761,7 +761,7 @@
<string name="security_settings_fingerprint_enroll_onboard_message">To use your fingerprint to unlock your screen or confirm purchases, you\u2019ll need to:</string> <string name="security_settings_fingerprint_enroll_onboard_message">To use your fingerprint to unlock your screen or confirm purchases, you\u2019ll need to:</string>
<!-- Introduction message shown in fingerprint enrollment dialog, first item to describe what <!-- Introduction message shown in fingerprint enrollment dialog, first item to describe what
the user needs to do. --> the user needs to do. -->
<string name="security_settings_fingerprint_enroll_onboard_message_1">Setup your backup screen lock method</string> <string name="security_settings_fingerprint_enroll_onboard_message_1">Set up your backup screen lock method</string>
<!-- Introduction message shown in fingerprint enrollment dialog, second item to describe what <!-- Introduction message shown in fingerprint enrollment dialog, second item to describe what
the user needs to do. --> the user needs to do. -->
<string name="security_settings_fingerprint_enroll_onboard_message_2">Add your fingerprint</string> <string name="security_settings_fingerprint_enroll_onboard_message_2">Add your fingerprint</string>
@@ -791,7 +791,7 @@
<!-- Message shown in fingerprint enrollment dialog once enrollment is completed --> <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
<string name="security_settings_fingerprint_enroll_finish_message">Whenever you see this icon, you can use your fingerprint for identification or to authorize a purchase.</string> <string name="security_settings_fingerprint_enroll_finish_message">Whenever you see this icon, you can use your fingerprint for identification or to authorize a purchase.</string>
<!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] --> <!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] -->
<string name="security_settings_fingerprint_enroll_setup_screen_lock">Setup screen lock</string> <string name="security_settings_fingerprint_enroll_setup_screen_lock">Set up screen lock</string>
<!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] --> <!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] -->
<string name="security_settings_fingerprint_enroll_done">Done</string> <string name="security_settings_fingerprint_enroll_done">Done</string>
<!-- Dialog title for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] --> <!-- Dialog title for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->

4
src/com/android/settings/fingerprint/FingerprintSettings.java
View File

@@ -259,9 +259,9 @@ public class FingerprintSettings extends SubSettings {
protected void removeFingerprintPreference(int fingerprintId) { protected void removeFingerprintPreference(int fingerprintId) {
String name = genKey(fingerprintId); String name = genKey(fingerprintId);
Preference prefToRemove = mManageCategory.findPreference(name); Preference prefToRemove = findPreference(name);
if (prefToRemove != null) { if (prefToRemove != null) {
if (!mManageCategory.removePreference(prefToRemove)) { if (!getPreferenceScreen().removePreference(prefToRemove)) {
Log.w(TAG, "Failed to remove preference with key " + name); Log.w(TAG, "Failed to remove preference with key " + name);
} }
} else { } else {