Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfa35a7b authored by Jason Chang's avatar Jason Chang Committed by Android (Google) Code Review
Browse files

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

parents 6c703e12 8c5bcaa3

res/drawable/face_enroll_icon_large.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
  -->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="300dp"

    android:height="300dp"

    android:width="@dimen/face_enroll_icon_large_width"

    android:height="@dimen/face_enroll_icon_large_height"

    android:viewportWidth="300"

    android:viewportHeight="300"

    android:tint="@color/face_enroll_icon_color">

res/layout/face_enroll_education.xml

+8 −4
Original line number Diff line number Diff line
@@ -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"/>

res/values/dimens.xml

+12 −0
Original line number Diff line number Diff line
@@ -517,4 +517,16 @@ 
    <dimen name="qrcode_icon_size">27dp</dimen>

    <!-- Margin for SD card setup completion Image -->

    <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>