summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2014-12-09 23:15:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-09 23:15:21 +0000
commit00a89f14399f08d9e4f8e95dddf4111b72d7d70d (patch)
tree6c59193c90406dd54e44579aabe5ccfd110c40cd
parent06b65d1c7d5f5c87f8d723b6ab0040f9bfc834c4 (diff)
parent86ed2cf33fa82aac1606e2a6e217fdff4ef6ef8f (diff)
downloadpackages_apps_Settings-00a89f14399f08d9e4f8e95dddf4111b72d7d70d.zip
packages_apps_Settings-00a89f14399f08d9e4f8e95dddf4111b72d7d70d.tar.gz
packages_apps_Settings-00a89f14399f08d9e4f8e95dddf4111b72d7d70d.tar.bz2
am 8fcbe816: am 400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev
automerge: 86ed2cf * commit '86ed2cf33fa82aac1606e2a6e217fdff4ef6ef8f': [FRP] Don't extract IME for PIN / Password during setup
-rw-r--r--res/layout/setup_choose_lock_password.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/layout/setup_choose_lock_password.xml b/res/layout/setup_choose_lock_password.xml
index 2f5e81c..59fa523 100644
--- a/res/layout/setup_choose_lock_password.xml
+++ b/res/layout/setup_choose_lock_password.xml
@@ -38,7 +38,7 @@
android:layout_marginEnd="30dip"
android:gravity="center"
android:inputType="textPassword"
- android:imeOptions="actionNext"
+ android:imeOptions="actionNext|flagNoExtractUi"
android:textSize="24sp"
style="@style/TextAppearance.PasswordEntry"/>