diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-07-24 21:45:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 20:48:02 +0000 |
| commit | 832ad7206299be6db94e82e2387c0fcf8df53e7e (patch) | |
| tree | ad171690fcd9c5e94cf4d0b8b69cf6acfb4f6168 /res | |
| parent | 6cef9d23b8572d8bd87329999f10286e29a861c0 (diff) | |
| parent | bd4c3210e1e0d6f58b2a5857032a2dacb316be98 (diff) | |
| download | packages_apps_Settings-832ad7206299be6db94e82e2387c0fcf8df53e7e.zip packages_apps_Settings-832ad7206299be6db94e82e2387c0fcf8df53e7e.tar.gz packages_apps_Settings-832ad7206299be6db94e82e2387c0fcf8df53e7e.tar.bz2 | |
Merge "Show countdown of remaining decrypt attempts before wiping device" into lmp-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/crypt_keeper_status.xml | 5 | ||||
| -rw-r--r-- | res/values/strings.xml | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml index 72f7aec..c366b57 100644 --- a/res/layout/crypt_keeper_status.xml +++ b/res/layout/crypt_keeper_status.xml @@ -25,6 +25,8 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal"> + <!-- We need android:gravity="center_horizontal" to make multi line + status strings look good --> <TextView android:id="@+id/status" android:layout_width="wrap_content" @@ -35,7 +37,8 @@ android:textSize="18sp" android:textAppearance="?android:attr/textAppearanceLarge" android:text="@string/enter_password" - android:layout_gravity="center_horizontal" /> + android:layout_gravity="center_horizontal" + android:gravity="center_horizontal" /> <TextView android:id="@+id/owner_info" diff --git a/res/values/strings.xml b/res/values/strings.xml index 02511b3..beff7d9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -867,6 +867,11 @@ <!-- Informational text on the password entry screen when password entry fails--> <string name="crypt_keeper_cooldown">Try again in <xliff:g id="delay" example="15">^1</xliff:g> seconds.</string> + <!-- Warn user their device will be wiped if they make x more failed attempts --> + <string name="crypt_keeper_warn_wipe">Warning: Your device will be wiped after + <xliff:g id="count" example="7">^1</xliff:g> more failed attempts to be unlocked! + </string> + <!-- Informational text on the password entry screen prompting the user for their password --> <string name="crypt_keeper_enter_password">Type your password</string> |