43f0076830
1. Set biometric_auth_pattern_view_size: 348dp (portrait)
2. Set resilience size 248dp~348dp for landscape mode
biometric_auth_pattern_view_(max_)size
3. Set 348dp size for sw410dp when display density < 560
Set 248dp-348dp resilience size for sw410dp-land
4. Add sw392dp sw392dp-land with density 440 projects
5. Set sw600dp/sw720dp/sw800dp for large screen device
6. Reference dimen biometric_auth_pattern_view_size in style
7. Remove redundant dup AuthCredentialPatternContainerStyle
8. Remove max & min bounds from AuthCredentialPatternContainerStyle
9. Remove unused choose_lockscreen_min_height dimen
10. Reduce footerText min hight to reserve more space for pattern view
Bug: 234847272
Bug: 243008023
Bug: 243699695
Test: manual
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=\
ChooseLockPatternTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=\
SetupChooseLockPatternTest
Change-Id: Icfc2932279aa9e3a065030dbb7ff73f12ed6d081
Merged-In: Icfc2932279aa9e3a065030dbb7ff73f12ed6d081
79 lines
3.3 KiB
XML
79 lines
3.3 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.google.android.setupdesign.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">
|
|
|
|
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
|
|
android:id="@+id/topLayout"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical">
|
|
|
|
<LinearLayout
|
|
style="@style/SudContentFrame"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
android:gravity="center"
|
|
android:paddingLeft="0dp"
|
|
android:paddingRight="0dp">
|
|
|
|
<com.google.android.setupdesign.view.FillContentLayout
|
|
style="@style/LockPatternContainerStyle"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="0dp"
|
|
android:layout_weight="1">
|
|
|
|
<com.android.internal.widget.LockPatternView
|
|
android:id="@+id/lockPattern"
|
|
android:layout_width="@dimen/biometric_auth_pattern_view_size"
|
|
android:layout_height="@dimen/biometric_auth_pattern_view_size"
|
|
android:layout_gravity="center" />
|
|
|
|
</com.google.android.setupdesign.view.FillContentLayout>
|
|
|
|
<TextView
|
|
style="@style/TextAppearance.ErrorText"
|
|
android:accessibilityLiveRegion="polite"
|
|
android:id="@+id/errorText"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_horizontal"
|
|
android:layout_marginStart="?attr/sudMarginStart"
|
|
android:layout_marginEnd="?attr/sudMarginEnd"
|
|
android:layout_marginTop="12dp"
|
|
android:gravity="center_vertical"/>
|
|
|
|
<Button
|
|
android:id="@+id/cancelButton"
|
|
style="@style/SudGlifButton.Secondary"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginStart="?attr/sudMarginStart"
|
|
android:layout_marginEnd="?attr/sudMarginEnd"
|
|
android:layout_marginBottom="80dp"
|
|
android:text="@string/cancel" />
|
|
|
|
</LinearLayout>
|
|
|
|
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
|
|
|
|
</com.google.android.setupdesign.GlifLayout>
|