edb3944984
- Added "Screen lock options" button in PIN screen, controlled by extra EXTRA_SHOW_OPTIONS_BUTTON, which will create a dialog to ask the user to choose another screen lock type. - Extracted ScreenLockType enum and ChooseLockGenericController that can be shared by ChooseLockGeneric and the dialog ChooseLockTypeDialogFragment. - The intent extra EXTRA_SHOW_OPTIONS_BUTTON will be set if ChooseLockGeneric screen starts ChooseLockPassword / ChooseLockPattern without asking the user. (Although the extra is ignored by ChooseLockPattern currently) - Fix layout alignment for the password entry field to remove the extra 4dp padding on the sides. Test: cd tests/robotests && mma Bug: 35442933 Bug: 38002299 Change-Id: I877fbe08a0c05bb97175e1cbf0260ea6dbda22e2
85 lines
3.3 KiB
XML
85 lines
3.3 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.android.setupwizardlib.GlifLayout
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:icon="@drawable/ic_lock"
|
|
settings:suwFooter="@layout/choose_lock_password_footer"
|
|
settings:suwHeaderText="@string/lockpassword_choose_your_password_header">
|
|
|
|
<LinearLayout
|
|
style="@style/SuwContentFrame"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false"
|
|
android:gravity="center_horizontal"
|
|
android:orientation="vertical">
|
|
|
|
<!-- header text ('Enter Pin') -->
|
|
<TextView
|
|
android:id="@+id/headerText"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:accessibilityLiveRegion="polite"
|
|
android:gravity="center"
|
|
android:lines="2"
|
|
android:textAppearance="?android:attr/textAppearanceMedium"/>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/password_container"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
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"
|
|
android:textSize="24sp"
|
|
style="@style/TextAppearance.PasswordEntry"/>
|
|
|
|
<android.support.v7.widget.RecyclerView
|
|
android:id="@+id/password_requirements_view"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"/>
|
|
|
|
</LinearLayout>
|
|
|
|
<Button
|
|
android:id="@+id/screen_lock_options"
|
|
style="@style/SuwGlifButton.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.android.setupwizardlib.GlifLayout>
|