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

Commit ef342736 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Set flagForceAscii for device password entries" into oc-dev

parents 0f1d2bb8 e2a7bddb

res/layout-land/confirm_lock_password.xml

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
                android:layout_gravity="center_horizontal|bottom"

                android:layout_marginBottom="26dp"

                android:inputType="textPassword"

                android:imeOptions="actionNext|flagNoFullscreen"

                android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"

                android:gravity="center"

                android:textSize="16sp"

                style="@style/TextAppearance.PasswordEntry"/>

res/layout/choose_lock_password.xml

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
            android:layout_gravity="center"

            android:gravity="center"

            android:inputType="textPassword"

            android:imeOptions="actionNext|flagNoExtractUi"

            android:imeOptions="actionNext|flagNoExtractUi|flagForceAscii"

            android:textSize="24sp"

            style="@style/TextAppearance.PasswordEntry"/>

res/layout/confirm_lock_password_base.xml

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
            android:layout_gravity="center_horizontal"

            android:layout_marginTop="-40dp"

            android:inputType="textPassword"

            android:imeOptions="actionNext|flagNoFullscreen"

            android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"

            android:gravity="center"

            android:textSize="16sp"

            style="@style/TextAppearance.PasswordEntry"/>

res/layout/confirm_lock_password_internal.xml

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
            android:layout_gravity="center_horizontal"

            android:layout_marginTop="-40dp"

            android:inputType="textPassword"

            android:imeOptions="actionNext|flagNoFullscreen"

            android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"

            android:gravity="center"

            android:textSize="16sp"

            style="@style/TextAppearance.PasswordEntry"/>

res/layout/crypt_keeper_password_field.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
        android:layout_width="0dip"

        android:layout_weight="1"

        android:inputType="textPassword"

        android:imeOptions="flagForceAscii"

        android:textSize="16sp"

        android:padding="10sp"

        android:maxLength="500"