Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3355e18f authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

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

parents 688de88b 31dae926
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -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>