Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 3356338: Add recovery text to AccountUnlockScreen" into honeycomb

Browse Source
This commit is contained in:
Jim Miller
2011-01-18 21:14:38 -08:00
committed by Android (Google) Code Review
parent 688de88b65 31dae92650
commit 3355e18f68
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/res/res/layout-xlarge/keyguard_screen_glogin_unlock.xml
View File

@@ -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>

2
core/res/res/values/strings.xml
View File

@@ -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>