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

Browse Source 
am: 68306c3409

Change-Id: Ibfeb785327d497fad3e8bff4de3b183ff5657fd2
This commit is contained in:
Jim Miller
2016-09-09 20:27:10 +00:00
committed by android-build-merger
parent e02dfb9d00 68306c3409
commit 3d0b4bb6c9
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() { private void updatePreferenceText() {
if (mForFingerprint) { if (mForFingerprint) {
Preference pattern = findPreference(KEY_UNLOCK_SET_PATTERN); final String key[] = { KEY_UNLOCK_SET_PATTERN,
pattern.setTitle(R.string.fingerprint_unlock_set_unlock_pattern); KEY_UNLOCK_SET_PIN,
KEY_UNLOCK_SET_PASSWORD };
Preference pin = findPreference(KEY_UNLOCK_SET_PIN); final int res[] = { R.string.fingerprint_unlock_set_unlock_pattern,
pin.setTitle(R.string.fingerprint_unlock_set_unlock_pin); R.string.fingerprint_unlock_set_unlock_pin,
R.string.fingerprint_unlock_set_unlock_password };
Preference password = findPreference(KEY_UNLOCK_SET_PASSWORD); for (int i = 0; i < key.length; i++) {
password.setTitle(R.string.fingerprint_unlock_set_unlock_password); Preference pref = findPreference(key[i]);
if (pref != null) { // can be removed by device admin
pref.setTitle(res[i]);
}
}
} }
if (mManagedPasswordProvider.isSettingManagedPasswordSupported()) { if (mManagedPasswordProvider.isSettingManagedPasswordSupported()) {