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

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

Merge "Update margins to match specs" into nyc-mr1-dev

parents 64b25588 b357e4a8

res/layout-land/fingerprint_enroll_finish.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
                style="@style/TextAppearance.FingerprintMessage"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/suw_description_margin_top"

                android:layout_marginTop="@dimen/suw_description_glif_margin_top"

                android:text="@string/setup_fingerprint_enroll_finish_message_secondary"

                android:textColor="?android:attr/textColorSecondary"

                android:visibility="gone" />

res/layout/fingerprint_enroll_enrolling_base.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/suw_description_margin_top">

            android:layout_marginTop="@dimen/suw_description_glif_margin_top">



            <TextView

                style="@style/TextAppearance.FingerprintMessage"

res/layout/fingerprint_enroll_find_sensor_base.xml

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
                style="@style/TextAppearance.FingerprintMessage"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/suw_description_margin_top"

                android:layout_marginTop="@dimen/suw_description_glif_margin_top"

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



            <View

res/layout/fingerprint_enroll_finish_base.xml

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
            style="@style/TextAppearance.FingerprintMessage"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/suw_description_margin_top"

            android:layout_marginTop="@dimen/suw_description_glif_margin_top"

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



        <TextView
@@ -43,7 +43,7 @@ 
            style="@style/TextAppearance.FingerprintMessage"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/suw_description_margin_top"

            android:layout_marginTop="@dimen/suw_description_glif_margin_top"

            android:text="@string/setup_fingerprint_enroll_finish_message_secondary"

            android:textColor="?android:attr/textColorSecondary"

            android:visibility="gone" />

res/layout/setup_choose_lock_generic_fingerprint_header.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ 
        android:layout_height="wrap_content"

        android:gravity="center_vertical"

        android:minHeight="56dp"

        android:paddingBottom="@dimen/suw_description_margin_bottom_lists"

        android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:paddingTop="@dimen/suw_description_margin_top"

        android:paddingTop="@dimen/suw_description_glif_margin_top"

        android:text="@string/setup_lock_settings_picker_fingerprint_message"

        android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"

        android:textAppearance="?android:attr/textAppearanceListItem" />