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

Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev

Browse Source
This commit is contained in:
Jason Chang
2023-01-13 12:31:40 +00:00
committed by Android (Google) Code Review
parent 6c703e12ae 8c5bcaa374
commit bfa35a7b1e
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/layout/face_enroll_education.xml
View File

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