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

Commit ef906938 authored by Maurice Lam's avatar Maurice Lam Committed by Android Git Automerger
Browse files

am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev 

* commit '3d9cb926':
  [Fingerprint] Use different ring size for setup
parents ef54ab61 3d9cb926

res/drawable/fingerprint_progress_ring.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:id="@android:id/background">

        <shape

            android:innerRadius="@dimen/fingerprint_ring_radius"

            android:innerRadius="?attr/fingerprint_ring_radius"

            android:shape="ring"

            android:thickness="@dimen/fingerprint_ring_thickness"

            android:useLevel="false">
@@ -26,7 +26,7 @@ 
    </item>

    <item android:id="@android:id/progress">

        <shape

            android:innerRadius="@dimen/fingerprint_ring_radius"

            android:innerRadius="?attr/fingerprint_ring_radius"

            android:shape="ring"

            android:thickness="@dimen/fingerprint_ring_thickness">

            <gradient

res/layout/fingerprint_enroll_enrolling_content.xml

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ 


    <ProgressBar

        android:id="@+id/fingerprint_progress_bar"

        android:layout_width="@dimen/fingerprint_progress_bar_size"

        android:layout_height="@dimen/fingerprint_progress_bar_size"

        android:layout_width="?attr/fingerprint_progress_bar_size"

        android:layout_height="?attr/fingerprint_progress_bar_size"

        android:layout_centerInParent="true"

        style="?android:attr/progressBarStyleHorizontal"

        android:max="10000"

res/values-sw400dp/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -22,4 +22,7 @@ 
    <dimen name="fingerprint_enrolling_content_margin_top">56dp</dimen>

    <dimen name="fingerprint_in_app_indicator_size">176dp</dimen>

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



    <dimen name="setup_fingerprint_ring_radius">106dp</dimen>

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

</resources>

res/values/dimens.xml

+5 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ 
    <dimen name="redaction_vertical_margins">8dp</dimen>



    <!-- Fingerprint -->

    <dimen name="fingerprint_ring_radius">80dip</dimen>

    <dimen name="fingerprint_ring_radius">92dip</dimen>

    <dimen name="fingerprint_ring_thickness">4dip</dimen>

    <dimen name="fingerprint_dot_radius">8dp</dimen>

    <dimen name="fingerprint_pulse_radius">50dp</dimen>
@@ -234,10 +234,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_size">168dp</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="setup_fingerprint_ring_radius">80dip</dimen>

    <dimen name="setup_fingerprint_progress_bar_size">168dp</dimen>



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

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

    <dimen name="fab_margin">16dp</dimen>

res/values/themes.xml

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


<resources>

    <attr name="fingerprint_layout_theme" format="reference" />

    <attr name="fingerprint_progress_bar_size" format="reference|dimension" />

    <attr name="fingerprint_ring_radius" format="reference|dimension" />

    <attr name="ic_menu_add" format="reference" />

    <attr name="ic_menu_moreoverflow" format="reference" />

    <attr name="ic_wps" format="reference" />
@@ -38,6 +40,8 @@ 
        <item name="android:windowBackground">?android:attr/colorBackground</item>

        <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>

        <item name="fingerprint_layout_theme">@style/SetupWizardFingerprintLayoutTheme</item>

        <item name="fingerprint_progress_bar_size">@dimen/setup_fingerprint_progress_bar_size</item>

        <item name="fingerprint_ring_radius">@dimen/setup_fingerprint_ring_radius</item>

        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>

        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>

        <item name="ic_wps">@drawable/ic_wps_dark</item>
@@ -61,6 +65,8 @@ 
        <item name="android:windowBackground">?android:attr/colorBackground</item>

        <item name="@*android:preferencePanelStyle">@*android:style/PreferencePanel.Dialog</item>

        <item name="fingerprint_layout_theme">@style/SetupWizardFingerprintLayoutTheme</item>

        <item name="fingerprint_progress_bar_size">@dimen/setup_fingerprint_progress_bar_size</item>

        <item name="fingerprint_ring_radius">@dimen/setup_fingerprint_ring_radius</item>

        <item name="ic_menu_add">@drawable/ic_menu_add_light</item>

        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>

        <item name="ic_wps">@drawable/ic_wps_light</item>
@@ -94,6 +100,8 @@ 
        <item name="apnPreferenceStyle">@style/ApnPreference</item>



        <item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>

        <item name="fingerprint_progress_bar_size">@dimen/fingerprint_progress_bar_size</item>

        <item name="fingerprint_ring_radius">@dimen/fingerprint_ring_radius</item>

        <item name="ic_menu_add">@drawable/ic_menu_add_dark</item>

        <item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>

        <item name="ic_wps">@drawable/ic_wps_light</item>