e2a7bddbe1
Since the beginning [1], ChooseLockPassword#validatePassword() has never
accepted non-ASCII characters [2]. Hence we can safely specify
EditorInfo#IME_FLAG_FORCE_ASCII so that IMEs can optimize their UX based
on this flag. Note that EditorInfo#IME_FLAG_FORCE_ASCII is just a hint
for the IME so there should be no behavior change in the system side.
Note also that EditorInfo#IME_FLAG_FORCE_ASCII has been used in KeyGuard
(keyguard_password_view.xml) since JB MR-1 [3] so this flag is considered
to be well tested.
[1]: 00d2476d8f
[2]: Only character c where 32 <= c <= 126 is accepted
[3]: Id75286113771ca1407e9db182172b580f870b612
Test: Run `adb shell dumpsys input_method` when the password entry
field is focused to make sure that 'imeOptions' parameter
has 0x80000000 bit. Tested the following scenarios:
- PIN on a direct-boot disabled device
- PIN on a direct-boot enabled device
- Password on a direct-boot disabled device
- Password on a direct-boot enabled device
Fixes: 27858858
Change-Id: I3075e24c6dac4d49f4d0e56a0d4d8434a323754d
98 lines
3.9 KiB
XML
98 lines
3.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2017 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
<com.android.setupwizardlib.GlifLayout
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:id="@+id/setup_wizard_layout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:icon="@drawable/ic_lock"
|
|
android:layout="@layout/suw_glif_blank_template">
|
|
|
|
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
|
|
android:id="@+id/topLayout"
|
|
android:orientation="vertical"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent">
|
|
|
|
<ImageView
|
|
android:id="@+id/suw_layout_icon"
|
|
style="@style/SuwGlifIcon"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:src="@drawable/ic_lock" />
|
|
|
|
<TextView
|
|
android:id="@+id/headerText"
|
|
style="@style/SuwGlifHeaderTitle"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content" />
|
|
|
|
<TextView
|
|
android:id="@+id/detailsText"
|
|
style="@style/SuwDescription.Glif"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="?attr/suwMarginSides"
|
|
android:layout_marginEnd="?attr/suwMarginSides" />
|
|
|
|
<Button
|
|
style="@style/SetupWizardButton.Negative"
|
|
android:id="@+id/cancelButton"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/cancel" />
|
|
|
|
<Space
|
|
android:layout_width="match_parent"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1" />
|
|
|
|
<EditText
|
|
android:id="@+id/password_entry"
|
|
android:layout_width="208dp"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_horizontal"
|
|
android:layout_marginTop="-40dp"
|
|
android:inputType="textPassword"
|
|
android:imeOptions="actionNext|flagNoFullscreen|flagForceAscii"
|
|
android:gravity="center"
|
|
android:textSize="16sp"
|
|
style="@style/TextAppearance.PasswordEntry"/>
|
|
|
|
<TextView
|
|
style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
|
|
android:accessibilityLiveRegion="polite"
|
|
android:id="@+id/errorText"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1"
|
|
android:layout_gravity="center_horizontal"
|
|
android:layout_marginStart="12dp"
|
|
android:layout_marginEnd="12dp"
|
|
android:gravity="center_vertical"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/fingerprintIcon"
|
|
android:layout_gravity="center_horizontal"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentBottom="true"
|
|
android:layout_marginBottom="24dp"
|
|
android:contentDescription="@string/confirm_fingerprint_icon_content_description"
|
|
android:visibility="gone"/>
|
|
|
|
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
|
|
</com.android.setupwizardlib.GlifLayout> |