- Add SwitchPreference to allow user to control the pin auto confirm feature - Add Checkbox option during the PIN setup in Security app - Disable the opt-in checkbox during SUW entry point for PIN setup - Update SwitchPreference availability appropriately according to current PIN length - Update the pin_auto_confirm setting appropriately according to state of switchPreference or checkbox state (in PIN setup) - Update the error-message when PIN Too short to let user know six digit is recommended Bug: 262926000 Bug: 262936383 Bug: 262934702 Bug: 262935305 Test: Manual Test Test: atest SettingsRoboTests Change-Id: Ib9e09bd5ce44652158e77f80e8be19c4dd50f3bf
106 lines
4.2 KiB
XML
106 lines
4.2 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!--
|
|
Copyright (C) 2014 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.google.android.setupdesign.GlifLayout
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:id="@+id/setup_wizard_layout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:icon="@drawable/ic_lock"
|
|
android:importantForAutofill="noExcludeDescendants">
|
|
|
|
<LinearLayout
|
|
style="@style/SudContentFrame"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false"
|
|
android:gravity="center_horizontal"
|
|
android:orientation="vertical">
|
|
|
|
<TextView
|
|
android:id="@+id/sud_layout_description"
|
|
style="@style/SudDescription.Glif"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:minLines="2"/>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/password_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="16dp"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false"
|
|
android:orientation="vertical"
|
|
android:layoutMode="opticalBounds"
|
|
android:paddingBottom="8dp">
|
|
|
|
<!-- Password entry field -->
|
|
<com.android.settings.widget.ScrollToParentEditText
|
|
android:id="@+id/password_entry"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"
|
|
android:gravity="center"
|
|
android:inputType="textPassword"
|
|
android:imeOptions="actionNext|flagNoExtractUi|flagForceAscii"
|
|
style="@style/TextAppearance.PasswordEntry"/>
|
|
|
|
<androidx.recyclerview.widget.RecyclerView
|
|
android:layout_marginTop="8dp"
|
|
android:id="@+id/password_requirements_view"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"/>
|
|
|
|
<CheckBox
|
|
android:id="@+id/auto_pin_confirm_enabler"
|
|
android:layout_marginTop="8dp"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_horizontal"
|
|
android:gravity="center"
|
|
android:paddingLeft="14dp"
|
|
android:text="@string/auto_pin_confirm_user_message"
|
|
android:textSize="16sp"
|
|
android:button="@drawable/checkbox_circle_shape"
|
|
android:visibility="gone" />
|
|
|
|
</LinearLayout>
|
|
|
|
<TextView
|
|
android:id="@+id/auto_pin_confirm_security_message"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="24dp"
|
|
android:gravity="center"
|
|
android:text="@string/auto_pin_confirm_opt_in_security_message"
|
|
android:textSize="16sp"
|
|
android:visibility="gone" />
|
|
|
|
<Button
|
|
android:id="@+id/screen_lock_options"
|
|
style="@style/SudGlifButton.Tertiary"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/setup_lock_settings_options_button_label"
|
|
android:visibility="gone" />
|
|
|
|
</LinearLayout>
|
|
|
|
</com.google.android.setupdesign.GlifLayout>
|