commit 50d7d19a7377df9421b6a0af2d8ecce2dfd32796
author Jim Miller <jaggies@google.com> Tue Jun 16 16:21:27 2015 -0700
committer Jim Miller <jaggies@google.com> Tue Jun 16 16:21:27 2015 -0700
tree 0526614dfd4338845308e9f7ad59894f88feb83d
parent a4f8aae4be4040685f88c79006d2cfee42f96504

Fix issue with german translation of lock times

The word "immediately" would go into a different place in the sentence
than a number so we have to break this into two strings.

Fixes bug 21602326

Change-Id: Ie07f1bc84d68bdea8d6f1264dfd18326c2e48df4

src/com/android/settings/SecuritySettings.java

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 93bf1e0..c967659 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -542,8 +542,13 @@
 
         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]));
         }