commit 426f8a58e1bc633c76b6526da6f2965040818e3f
author Bill Lin <lbill@google.com> Wed Apr 20 06:17:35 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 20 06:17:35 2022 +0000
tree 6c191a9670110a625bc002fbda74f1d5b48c4498
parent 2e39766a1f16d8b00f1ed99dfebade43755c97f4
parent 6a45659d7b1ac30db13aba32694e56b03b2324cf

Merge "Set IME_FLAG_NO_EXTRACT_UI for ImeAwareEditText" into tm-dev

res/layout/confirm_lock_password_base.xml

diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index 7c2fc5b..a3e5659 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -59,7 +59,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:inputType="textPassword"
-                android:imeOptions="actionNext|flagForceAscii"
+                android:imeOptions="actionNext|flagForceAscii|flagNoExtractUi"
                 android:gravity="center"
                 style="@style/TextAppearance.PasswordEntry"/>
 

res/layout/confirm_lock_password_normal.xml

diff --git a/res/layout/confirm_lock_password_normal.xml b/res/layout/confirm_lock_password_normal.xml
index f2b8d1f..645c444 100644
--- a/res/layout/confirm_lock_password_normal.xml
+++ b/res/layout/confirm_lock_password_normal.xml
@@ -52,7 +52,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:inputType="textPassword"
-                android:imeOptions="actionNext|flagForceAscii"
+                android:imeOptions="actionNext|flagForceAscii|flagNoExtractUi"
                 android:gravity="center"
                 style="@style/TextAppearance.PasswordEntry"/>
 
@@ -85,4 +85,4 @@
             android:text="@string/cancel" />
 
     </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
-</com.google.android.setupdesign.GlifLayout>
\ No newline at end of file
+</com.google.android.setupdesign.GlifLayout>