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

Commit f6bdf532 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev 

* commit '74af384c':
  Adjust enrollment UI for sw400 devices
parents 22064d8b 74af384c

res/layout-land/fingerprint_enroll_enrolling.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,10 @@ 
            android:layout_weight="1"

            android:layout_weight="1"

            android:layout_height="match_parent">

            android:layout_height="match_parent">





            <include layout="@layout/fingerprint_enroll_enrolling_content"/>

            <include layout="@layout/fingerprint_enroll_enrolling_content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center"/>





            <TextView

            <TextView

                style="@style/TextAppearance.FingerprintErrorText"

                style="@style/TextAppearance.FingerprintErrorText"

res/layout-land/fingerprint_enroll_finish.xml

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




            <ImageView

            <ImageView

                android:id="@+id/fingerprint_in_app_indicator"

                android:id="@+id/fingerprint_in_app_indicator"

                android:layout_width="120dp"

                android:layout_width="@dimen/fingerprint_in_app_indicator_size"

                android:layout_height="120dp"

                android:layout_height="@dimen/fingerprint_in_app_indicator_size"

                android:layout_gravity="center_horizontal"

                android:layout_gravity="center_horizontal"

                android:contentDescription="@android:string/fingerprint_icon_content_description"

                android:contentDescription="@android:string/fingerprint_icon_content_description"

                android:src="@drawable/fp_app_indicator" />

                android:src="@drawable/fp_app_indicator" />

res/layout/fingerprint_enroll_enrolling_base.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -57,8 +57,8 @@ 
        <include layout="@layout/fingerprint_enroll_enrolling_content"

        <include layout="@layout/fingerprint_enroll_enrolling_content"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="36dp"

            android:layout_gravity="center_horizontal"

            android:layout_gravity="center_horizontal"/>

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





        <TextView

        <TextView

            style="@style/TextAppearance.FingerprintErrorText"

            style="@style/TextAppearance.FingerprintErrorText"

res/layout/fingerprint_enroll_enrolling_content.xml

+4 −5
Original line number Original line Diff line number Diff line
@@ -19,13 +19,12 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:layout_width="wrap_content"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:layout_marginTop="36dp"

    android:layout_gravity="center_horizontal">

    android:layout_gravity="center_horizontal">





    <ImageView

    <ImageView

        android:id="@+id/fingerprint_animator"

        android:id="@+id/fingerprint_animator"

        android:layout_width="88dp"

        android:layout_width="@dimen/fingerprint_animation_size"

        android:layout_height="88dp"

        android:layout_height="@dimen/fingerprint_animation_size"

        android:layout_centerInParent="true"

        android:layout_centerInParent="true"

        android:background="@drawable/fp_illustration_enrollment"

        android:background="@drawable/fp_illustration_enrollment"

        android:backgroundTint="@color/fingerprint_indicator_background_resting"

        android:backgroundTint="@color/fingerprint_indicator_background_resting"
@@ -33,8 +32,8 @@ 




    <ProgressBar

    <ProgressBar

        android:id="@+id/fingerprint_progress_bar"

        android:id="@+id/fingerprint_progress_bar"

        android:layout_width="192dp"

        android:layout_width="@dimen/fingerprint_progress_bar_size"

        android:layout_height="192dp"

        android:layout_height="@dimen/fingerprint_progress_bar_size"

        android:layout_centerInParent="true"

        android:layout_centerInParent="true"

        style="?android:attr/progressBarStyleHorizontal"

        style="?android:attr/progressBarStyleHorizontal"

        android:max="10000"

        android:max="10000"

res/layout/fingerprint_enroll_find_sensor_base.xml

+5 −1
Original line number Original line Diff line number Diff line
@@ -37,9 +37,13 @@ 
            android:layout_marginTop="@dimen/suw_description_margin_top"

            android:layout_marginTop="@dimen/suw_description_margin_top"

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

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





        <View

            android:layout_height="0dp"

            android:layout_width="match_parent"

            android:layout_weight="1"/>



        <include

        <include

            layout="@layout/fingerprint_enroll_find_sensor_graphic"

            layout="@layout/fingerprint_enroll_find_sensor_graphic"

            android:layout_marginTop="32dp"

            android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"

            android:layout_width="@dimen/fingerprint_find_sensor_graphic_size"

            android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"

            android:layout_height="@dimen/fingerprint_find_sensor_graphic_size"

            android:layout_gravity="center_horizontal"/>

            android:layout_gravity="center_horizontal"/>