PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(2/2) Fix settings face enrollment UI layout problem

Browse Source 
To extract face_enroll_education.xml layout dimensions to dimens.xml
1. Fix settings face enrollment UI truncate problem
2. Fix It's hard to tap "setup for limited vision or head motion"
button

Bug: 260653042
Bug: 263065347

Test: manually go to Settings > Security & privacy > Device lock >
Face & Fingerprint Unlock > Face Unlock, then start enroll Face,
In second stage ("How to set up Face Unlock" page ), check the layout
and lottie animation do not truncate.
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollEducationTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollIntroductionTest"

Change-Id: I7d7bad8b91dd505772e8f2b28cb4b872a4750cb4
This commit is contained in:
Jason Chang
2022-12-14 10:59:00 +00:00
parent e722587923
commit 8c5bcaa374
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/drawable/face_enroll_icon_large.xml
View File

@@ -16,8 +16,8 @@
--> -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="300dp" android:width="@dimen/face_enroll_icon_large_width"
android:height="300dp" android:height="@dimen/face_enroll_icon_large_height"
android:viewportWidth="300" android:viewportWidth="300"
android:viewportHeight="300" android:viewportHeight="300"
android:tint="@color/face_enroll_icon_color"> android:tint="@color/face_enroll_icon_color">

12
res/layout/face_enroll_education.xml
View File

@@ -39,7 +39,7 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="-24dp"> android:layout_marginTop="@dimen/face_enroll_education_lottie_frame_margin_top">
<com.google.android.setupdesign.view.IllustrationVideoView <com.google.android.setupdesign.view.IllustrationVideoView
android:id="@+id/illustration_default" android:id="@+id/illustration_default"
@@ -52,8 +52,8 @@
<com.airbnb.lottie.LottieAnimationView <com.airbnb.lottie.LottieAnimationView
android:id="@+id/illustration_lottie" android:id="@+id/illustration_lottie"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="440dp" android:layout_height="@dimen/illustration_lottie_height"
android:layout_marginTop="-52dp" android:layout_marginTop="@dimen/lottie_animation_view_margin_top"
android:scaleType="centerInside" android:scaleType="centerInside"
android:visibility="gone" android:visibility="gone"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
@@ -66,6 +66,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:visibility="invisible" android:visibility="invisible"
android:layout_marginTop="@dimen/illustration_accessibility_margin_top"
android:src="@drawable/face_enroll_icon_large"/> android:src="@drawable/face_enroll_icon_large"/>
</FrameLayout> </FrameLayout>
@@ -84,7 +85,7 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="-24dp"> android:layout_marginTop="@dimen/limited_vision_button_frame_margin_top">
<Button <Button
android:id="@+id/accessibility_button" android:id="@+id/accessibility_button"
@@ -92,12 +93,15 @@
android:layout_gravity="center" android:layout_gravity="center"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/limited_vision_button_margin_top"
android:layout_marginBottom="@dimen/limited_vision_button_margin_bottom"
android:text="@string/security_settings_face_enroll_introduction_accessibility"/> android:text="@string/security_settings_face_enroll_introduction_accessibility"/>
<com.android.settings.biometrics.face.FaceEnrollAccessibilityToggle <com.android.settings.biometrics.face.FaceEnrollAccessibilityToggle
android:id="@+id/toggle_diversity" android:id="@+id/toggle_diversity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/limited_vision_button_toggle_margin_top"
android:visibility="gone" android:visibility="gone"
app:messageText="@string/security_settings_face_enroll_introduction_accessibility"/> app:messageText="@string/security_settings_face_enroll_introduction_accessibility"/>

12
res/values/dimens.xml
View File

@@ -513,4 +513,16 @@
<dimen name="qrcode_icon_size">27dp</dimen> <dimen name="qrcode_icon_size">27dp</dimen>
<!-- Margin for SD card setup completion Image --> <!-- Margin for SD card setup completion Image -->
<dimen name="setup_completion_margin_top">88dp</dimen> <dimen name="setup_completion_margin_top">88dp</dimen>
<!-- Biometrics Face enroll education dimensions-->
<dimen name="face_enroll_icon_large_width">300dp</dimen>
<dimen name="face_enroll_icon_large_height">300dp</dimen>
<dimen name="illustration_lottie_height">440dp</dimen>
<dimen name="illustration_accessibility_margin_top">0dp</dimen>
<dimen name="face_enroll_education_lottie_frame_margin_top">-24dp</dimen>
<dimen name="lottie_animation_view_margin_top">-52dp</dimen>
<dimen name="limited_vision_button_frame_margin_top">-24dp</dimen>
<dimen name="limited_vision_button_margin_top">0dp</dimen>
<dimen name="limited_vision_button_margin_bottom">0dp</dimen>
<dimen name="limited_vision_button_toggle_margin_top">0dp</dimen>
</resources> </resources>