PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: ef34273654

Change-Id: Id4334fbb8911a7d826c547004773e03ef90f69d1
This commit is contained in:
Yohei Yukawa
2017-03-28 23:27:45 +00:00
committed by android-build-merger
parent c8238c7fb9 ef34273654
commit 6c4d4600e3
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout-land/confirm_lock_password.xml
View File

@@ -74,7 +74,7 @@
android:layout_gravity="center_horizontal|bottom" android:layout_gravity="center_horizontal|bottom"
android:layout_marginBottom="26dp" android:layout_marginBottom="26dp"
android:inputType="textPassword" android:inputType="textPassword"
android:imeOptions="actionNext|flagNoFullscreen" android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
android:gravity="center" android:gravity="center"
android:textSize="16sp" android:textSize="16sp"
style="@style/TextAppearance.PasswordEntry"/> style="@style/TextAppearance.PasswordEntry"/>

2
res/layout/choose_lock_password.xml
View File

@@ -48,7 +48,7 @@
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:inputType="textPassword" android:inputType="textPassword"
android:imeOptions="actionNext|flagNoExtractUi" android:imeOptions="actionNext|flagNoExtractUi|flagForceAscii"
android:textSize="24sp" android:textSize="24sp"
style="@style/TextAppearance.PasswordEntry"/> style="@style/TextAppearance.PasswordEntry"/>

2
res/layout/confirm_lock_password_base.xml
View File

@@ -70,7 +70,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="-40dp" android:layout_marginTop="-40dp"
android:inputType="textPassword" android:inputType="textPassword"
android:imeOptions="actionNext|flagNoFullscreen" android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
android:gravity="center" android:gravity="center"
android:textSize="16sp" android:textSize="16sp"
style="@style/TextAppearance.PasswordEntry"/> style="@style/TextAppearance.PasswordEntry"/>

2
res/layout/confirm_lock_password_internal.xml
View File

@@ -67,7 +67,7 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="-40dp" android:layout_marginTop="-40dp"
android:inputType="textPassword" android:inputType="textPassword"
android:imeOptions="actionNext|flagNoFullscreen" android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
android:gravity="center" android:gravity="center"
android:textSize="16sp" android:textSize="16sp"
style="@style/TextAppearance.PasswordEntry"/> style="@style/TextAppearance.PasswordEntry"/>

1
res/layout/crypt_keeper_password_field.xml
View File

@@ -27,6 +27,7 @@
android:layout_width="0dip" android:layout_width="0dip"
android:layout_weight="1" android:layout_weight="1"
android:inputType="textPassword" android:inputType="textPassword"
android:imeOptions="flagForceAscii"
android:textSize="16sp" android:textSize="16sp"
android:padding="10sp" android:padding="10sp"
android:maxLength="500" android:maxLength="500"