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

am dd0d9854: am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev

Browse Source 
* commit 'dd0d9854a5e4e946e8cb55a91148f17e4424836f':
  Fix issue with german translation of lock times
This commit is contained in:
Jim Miller
2015-06-17 00:20:35 +00:00
committed by Android Git Automerger
parent 122b4d735f dd0d9854a5
commit 8b5943c2fb
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -653,6 +653,8 @@
<!-- Security settings screen, setting option summary to change screen timeout -->
<string name="lock_after_timeout_summary"><xliff:g id="timeout_string">%1$s</xliff:g> after sleep</string>
<!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
<string name="lock_immediately_summary_with_exception">Immediately after sleep, except when kept unlocked by <xliff:g id="trust_agent_name">%1$s</xliff:g></string>
<!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
<string name="lock_after_timeout_summary_with_exception"><xliff:g id="timeout_string">%1$s</xliff:g> after sleep, except when kept unlocked by <xliff:g id="trust_agent_name">%2$s</xliff:g></string>
<!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
<string name="show_owner_info_on_lockscreen_label">Show owner info on lock screen</string>

5
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) {
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]));
}