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

Check for missing preference before setting title. am: 06458be226 am: 68306c3409

Browse Source 
am: 3d0b4bb6c9

Change-Id: I75dc4b7f832884fa4a6eb9f5e934d1da36d303f0
This commit is contained in:
Jim Miller
2016-09-09 20:32:31 +00:00
committed by android-build-merger
parent 34244de96c 3d0b4bb6c9
commit b5f3c1d9b6
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -355,14 +355,18 @@ public class ChooseLockGeneric extends SettingsActivity {
private void updatePreferenceText() {
if (mForFingerprint) {
Preference pattern = findPreference(KEY_UNLOCK_SET_PATTERN);
pattern.setTitle(R.string.fingerprint_unlock_set_unlock_pattern);
Preference pin = findPreference(KEY_UNLOCK_SET_PIN);
pin.setTitle(R.string.fingerprint_unlock_set_unlock_pin);
Preference password = findPreference(KEY_UNLOCK_SET_PASSWORD);
password.setTitle(R.string.fingerprint_unlock_set_unlock_password);
final String key[] = { KEY_UNLOCK_SET_PATTERN,
KEY_UNLOCK_SET_PIN,
KEY_UNLOCK_SET_PASSWORD };
final int res[] = { R.string.fingerprint_unlock_set_unlock_pattern,
R.string.fingerprint_unlock_set_unlock_pin,
R.string.fingerprint_unlock_set_unlock_password };
for (int i = 0; i < key.length; i++) {
Preference pref = findPreference(key[i]);
if (pref != null) { // can be removed by device admin
pref.setTitle(res[i]);
}
}
}
if (mManagedPasswordProvider.isSettingManagedPasswordSupported()) {