c0f0b0ca1a
in the wrong position on PIN/Password/Pattern in the landscape mode. 1. Move the description position under the GlifLayout header 2. Move the position "Screen lock options" button under the GlifLayout header Bug: 272676038 Bug: 285271342 Test: manully test with reproducible steps: STEPS TO REPRODUCE: 1. Go through the setup flow 2. Continue steps until “set pin” page 3. The “screen lock option” is in the wrong position Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings .password.SetupChooseLockPasswordTest" Change-Id: I24464e6b7e93f20abbeb59426919ed7fec5c7cbb
91 lines
3.5 KiB
XML
91 lines
3.5 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"/>
|
|
|
|
<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: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" />
|
|
|
|
</LinearLayout>
|
|
|
|
</com.google.android.setupdesign.GlifLayout>
|