diff options
| author | Jim Miller <jaggies@google.com> | 2011-01-18 21:14:38 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-18 21:14:38 -0800 |
| commit | 3355e18f68c5a8fce62e783fe370afaf0899d655 (patch) | |
| tree | 1f6e53eb9a3bc98998477163a35cc44707ef5261 /core/res | |
| parent | 688de88b65cdafc62a82a4eb2ff182fd320a0e51 (diff) | |
| parent | 31dae92650335b7068b9d080bd2c0b526060f2fa (diff) | |
| download | frameworks_base-3355e18f68c5a8fce62e783fe370afaf0899d655.zip frameworks_base-3355e18f68c5a8fce62e783fe370afaf0899d655.tar.gz frameworks_base-3355e18f68c5a8fce62e783fe370afaf0899d655.tar.bz2 | |
Merge "Fix 3356338: Add recovery text to AccountUnlockScreen" into honeycomb
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/layout-xlarge/keyguard_screen_glogin_unlock.xml | 10 | ||||
| -rwxr-xr-x | core/res/res/values/strings.xml | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/core/res/res/layout-xlarge/keyguard_screen_glogin_unlock.xml b/core/res/res/layout-xlarge/keyguard_screen_glogin_unlock.xml index 4f5beff..9779074 100644 --- a/core/res/res/layout-xlarge/keyguard_screen_glogin_unlock.xml +++ b/core/res/res/layout-xlarge/keyguard_screen_glogin_unlock.xml @@ -100,6 +100,16 @@ android:text="@android:string/lockscreen_glogin_submit_button" /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/ok" + android:layout_marginTop="50dip" + android:text="@android:string/lockscreen_glogin_account_recovery_hint" + android:textAppearance="?android:attr/textAppearanceMedium" + android:gravity="center_horizontal" + /> + </RelativeLayout> </ScrollView> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 2658b53..7550905 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1784,6 +1784,8 @@ <string name="lockscreen_glogin_submit_button">Sign in</string> <!-- Displayed to the user when unlocking the phone with a username and password fails. --> <string name="lockscreen_glogin_invalid_input">Invalid username or password.</string> + <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. --> + <string name="lockscreen_glogin_account_recovery_hint">Forgot your username or password\?\nVisit <b>google.com/accounts/recovery</b></string> <!-- Displayed in a progress dialog while a username and password are being checked. --> <string name="lockscreen_glogin_checking_password">Checking...</string> |