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

Commit 3065eeff authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "Align fingerprint illustration size" into oc-dr1-dev

parents 6dfafa5d a57730aa

res/layout/fingerprint_enroll_enrolling_base.xml

+24 −15
Original line number Diff line number Diff line
@@ -34,14 +34,14 @@ 
             switch the text -->

        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/suw_description_glif_margin_top">

            android:layout_height="wrap_content">



            <TextView

                style="@style/SuwDescription.Glif"

                android:id="@+id/start_message"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:minLines="3"

                android:text="@string/security_settings_fingerprint_enroll_start_message"/>



            <TextView
@@ -49,17 +49,23 @@ 
                android:id="@+id/repeat_message"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:minLines="3"

                android:text="@string/security_settings_fingerprint_enroll_repeat_message"

                android:visibility="invisible"/>



        </FrameLayout>



        <include layout="@layout/fingerprint_enroll_enrolling_content"

            android:layout_width="@dimen/fingerprint_progress_bar_max_size"

        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1"

            android:layout_gravity="center_horizontal"

            android:layout_marginTop="@dimen/fingerprint_enrolling_content_margin_top"/>

            android:paddingBottom="80dp">



            <include layout="@layout/fingerprint_enroll_enrolling_content"

                android:layout_width="@dimen/fingerprint_progress_bar_max_size"

                android:layout_height="@dimen/fingerprint_progress_bar_max_size"

                android:layout_gravity="center"

                android:layout_marginVertical="24dp"/>



            <TextView

                style="@style/TextAppearance.FingerprintErrorText"
@@ -67,10 +73,13 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="24dp"

            android:layout_gravity="center_horizontal"

                android:layout_gravity="center_horizontal|bottom"

                android:accessibilityLiveRegion="polite"

                android:gravity="center"

                android:visibility="invisible"/>



        </FrameLayout>



    </LinearLayout>



</com.android.setupwizardlib.GlifLayout>

res/layout/fingerprint_enroll_finish_base.xml

+5 −2
Original line number Diff line number Diff line
@@ -38,12 +38,15 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/suw_description_glif_margin_top"

            android:minLines="3"

            android:text="@string/security_settings_fingerprint_enroll_finish_message"/>



        <com.android.setupwizardlib.view.FillContentLayout

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1">

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:maxWidth="@dimen/fingerprint_finish_max_size"

            android:maxHeight="@dimen/fingerprint_finish_max_size">



            <ImageView

                android:id="@+id/fingerprint_in_app_indicator"

res/values-sw400dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
  -->



<resources>

    <dimen name="fingerprint_enrolling_content_margin_top">56dp</dimen>

    <dimen name="fingerprint_enrolling_content_margin_vertical">56dp</dimen>

    <dimen name="fingerprint_find_sensor_graphic_size">240dp</dimen>



    <dimen name="support_escalation_card_padding_start">56dp</dimen>

res/values/dimens.xml

+6 −2
Original line number Diff line number Diff line
@@ -225,9 +225,13 @@ 
    <dimen name="fingerprint_error_text_appear_distance">16dp</dimen>

    <dimen name="fingerprint_error_text_disappear_distance">-8dp</dimen>

    <dimen name="fingerprint_animation_size">88dp</dimen>

    <dimen name="fingerprint_progress_bar_max_size">220dp</dimen>

    <dimen name="fingerprint_progress_bar_max_size">240dp</dimen>

    <dimen name="fingerprint_progress_bar_min_size">120dp</dimen>

    <dimen name="fingerprint_enrolling_content_margin_top">36dp</dimen>

    <dimen name="fingerprint_enrolling_content_margin_vertical">24dp</dimen>

    <!-- To be the same size as fingerprint progress bar:

         fingerprint_finish_max_size = fingerprint_progress_bar_max_size

                  + (fingerprint_enrolling_content_margin_vertical x 2) -->

    <dimen name="fingerprint_finish_max_size">288dp</dimen>



    <dimen name="confirm_credentials_security_method_margin">48dp</dimen>

    <dimen name="confirm_credentials_layout_width">@dimen/match_parent</dimen>