7135d36d37
Since the SetupChooseLockPattern include header icon
header title, header sub-title, pattern state description,
LockPatternView and FooterBar, there was a limited room
for LockPatternView especially in the confirm steps which
both header title and pattern description occupy 2 lines space.
Hance the PatternView size used to inconsistence in-between
1st draw and 2nd confirm draw, besides it's visual looks
jumping and small on some device which have smaller display.
This solution includes 3 changes:
1. Organized the pattern view message to leverage
header sub-title view, then we can resever more space.
(Set minHeight=2 for sub-title)
2. Set screen_lock_options button visibilty to GONE when
the stage in 2nd confirmation.(Previously it's INVISIBLE
and reserve additional space)
3. Let LockPatternView align bottom of FrameLayout to prevent
the view juming and flicker.
4. Clean up unused forAnyBiometric flag and code.
5. GlifLayout.getDescriptionTextView() == mHeaderView
Need setDescriptionText() to make the view from GONE -> VISIBLE
6. Polish the stage flow and ensure IntroductionStage show
correct message
7. Add ChooseLockPattern into embeded activity white list
Force show ChooseLockPattern in fullscreen in case the Pattern
view truncated in `NeedToConfirmStage` where the title showing
2 lines and push pattern view down, and get bad UX in the
device which integrate a shorter display.
8. Add test cases for all stage and polish legacy test code.
Test: make RunSettingsRoboTests ROBOTEST_FILTER= \
"com.android.settings.password.SetupChooseLockPatternTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER= \
"com.android.settings.password.ChooseLockPatternTest"
Bug: 249974175
Bug: 260027850
Change-Id: I868af9b14ba99af5d78a05f6c2a570ccc07aea15
72 lines
2.9 KiB
XML
72 lines
2.9 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.
|
|
-->
|
|
|
|
<!-- Used in phone portrait and tablet, as referenced in alias.xml. -->
|
|
<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">
|
|
|
|
<!-- takes up all space above button bar at bottom -->
|
|
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
|
|
android:id="@+id/topLayout"
|
|
style="@style/SudContentFrame"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:gravity="center"
|
|
android:clipChildren="false"
|
|
android:clipToPadding="false"
|
|
android:orientation="vertical"
|
|
android:paddingLeft="0dp"
|
|
android:paddingRight="0dp">
|
|
|
|
<Button
|
|
android:id="@+id/screen_lock_options"
|
|
style="@style/LockPatternButtonStyle"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/setup_lock_settings_options_button_label"
|
|
android:visibility="gone"/>
|
|
|
|
<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 android:id="@+id/footerText"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center_horizontal"
|
|
android:minHeight="24dp"
|
|
android:textSize="14sp"
|
|
android:visibility="gone"/>
|
|
|
|
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
|
|
|
|
</com.google.android.setupdesign.GlifLayout>
|