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

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

Merge "Fix 3384942: Force ASCII-capable IME to show on lockscreen" into ics-mr0

parents e869ca96 214406a8

core/res/res/layout-sw600dp/keyguard_screen_password_landscape.xml

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
                android:textAppearance="?android:attr/textAppearanceMedium"

                android:background="@drawable/lockscreen_password_field_dark"

                android:textColor="#ffffffff"

                android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"

                />



            <!-- Numeric keyboard -->

core/res/res/layout-sw600dp/keyguard_screen_password_portrait.xml

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
            android:textAppearance="?android:attr/textAppearanceMedium"

            android:background="@drawable/lockscreen_password_field_dark"

            android:textColor="#ffffffff"

            android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"

            />



        <View

core/res/res/layout/keyguard_screen_password_landscape.xml

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ 
            android:background="@null"

            android:textColor="?android:attr/textColorPrimary"

            android:imeOptions="flagNoFullscreen|actionDone"

            android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"

            />



        <!-- This delete button is only visible for numeric PIN entry -->

core/res/res/layout/keyguard_screen_password_portrait.xml

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ 
            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textColor="#ffffffff"

            android:imeOptions="actionDone"

            android:privateImeOptions="com.google.android.inputmethod.latin.forceAscii"

            />



        <!-- This delete button is only visible for numeric PIN entry -->