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

Merge "Fix issue with german translation of lock times" into mnc-dev

Browse Source
This commit is contained in:
Jim Miller
2015-06-16 23:59:36 +00:00
committed by Android (Google) Code Review
parent 4e42cbdba3 50d7d19a73
commit 4b60af78fa
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/SecuritySettings.java
View File

@@ -542,8 +542,13 @@ public class SecuritySettings extends SettingsPreferenceFragment
Preference preference = getPreferenceScreen().findPreference(KEY_TRUST_AGENT);
if (preference != null && preference.getTitle().length() > 0) {
mLockAfter.setSummary(getString(R.string.lock_after_timeout_summary_with_exception,
entries[best], preference.getTitle()));
if (Long.valueOf(values[best].toString()) == 0) {
mLockAfter.setSummary(getString(R.string.lock_immediately_summary_with_exception,
preference.getTitle()));
} else {
mLockAfter.setSummary(getString(R.string.lock_after_timeout_summary_with_exception,
entries[best], preference.getTitle()));
}
} else {
mLockAfter.setSummary(getString(R.string.lock_after_timeout_summary, entries[best]));
}