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

Commit 7f4892f2 authored by Ido Ofir's avatar Ido Ofir Committed by Android (Google) Code Review
Browse files

Merge "Changing dimensions and margins for fingerprint image in portrait mode....

Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev
parents 50669fa3 81513d7a
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -49,20 +49,25 @@
            android:visibility="gone" />

        <View
            android:layout_height="0dp"
            android:layout_height="24dp"
            android:layout_width="match_parent"
            android:layout_weight="1"/>

        <ImageView
            android:id="@+id/fingerprint_in_app_indicator"
            android:layout_width="@dimen/fingerprint_in_app_indicator_size"
            android:layout_height="@dimen/fingerprint_in_app_indicator_size"
            android:layout_height="wrap_content"
            android:layout_width="wrap_content"
            android:layout_weight="5"
            android:minHeight="@dimen/fingerprint_in_app_indicator_min_size"
            android:minWidth="@dimen/fingerprint_in_app_indicator_min_size"
            android:maxHeight="@dimen/fingerprint_in_app_indicator_max_size"
            android:maxWidth="@dimen/fingerprint_in_app_indicator_max_size"
            android:layout_gravity="center_horizontal"
            android:contentDescription="@android:string/fingerprint_icon_content_description"
            android:src="@drawable/fp_app_indicator" />

        <View
            android:layout_height="0dp"
            android:layout_height="24dp"
            android:layout_width="match_parent"
            android:layout_weight="1"/>

+3 −1
Original line number Diff line number Diff line
@@ -228,7 +228,9 @@
    <dimen name="fingerprint_animation_size">88dp</dimen>
    <dimen name="fingerprint_progress_bar_size">192dp</dimen>
    <dimen name="fingerprint_enrolling_content_margin_top">36dp</dimen>
    <dimen name="fingerprint_in_app_indicator_size">120dp</dimen>
    <dimen name="fingerprint_in_app_indicator_size">124dp</dimen>
    <dimen name="fingerprint_in_app_indicator_min_size">124dp</dimen>
    <dimen name="fingerprint_in_app_indicator_max_size">264dp</dimen>

    <dimen name="setup_fingerprint_ring_radius">80dip</dimen>
    <dimen name="setup_fingerprint_progress_bar_size">168dp</dimen>