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

Commit c1327368 authored by Ajay Nadathur's avatar Ajay Nadathur
Browse files

Fingerprint added graphic is bigger than enrolling progressbar 

bug: 63714762
Test: Manually tested
Change-Id: I415ab41bb985eb52146693091d61152b51ecfd6c
parent 446c5b08

res/layout-land/fingerprint_enroll_enrolling.xml

+12 −4
Original line number Diff line number Diff line
@@ -108,10 +108,18 @@ 
                android:gravity="center"

                android:orientation="vertical">



                <com.android.setupwizardlib.view.FillContentLayout

                    android:layout_width="@dimen/fingerprint_progress_bar_max_size"

                    android:layout_height="@dimen/fingerprint_progress_bar_max_size"

                    android:paddingTop="0dp"

                    android:paddingBottom="0dp"

                    android:layout_marginVertical="24dp">



                    <include layout="@layout/fingerprint_enroll_enrolling_content"

                         android:layout_width="match_parent"

                         android:layout_height="match_parent"

                         android:layout_gravity="center" />

                </com.android.setupwizardlib.view.FillContentLayout>



                <TextView

                    style="@style/TextAppearance.FingerprintErrorText"

res/layout/fingerprint_enroll_enrolling_base.xml

+10 −3
Original line number Diff line number Diff line
@@ -64,11 +64,18 @@ 
            android:gravity="center"

            android:orientation="vertical">



            <include layout="@layout/fingerprint_enroll_enrolling_content"

            <com.android.setupwizardlib.view.FillContentLayout

                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"/>

                android:paddingTop="0dp"

                android:paddingBottom="0dp"

                android:layout_marginVertical="24dp">



                <include layout="@layout/fingerprint_enroll_enrolling_content"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:layout_gravity="center" />

            </com.android.setupwizardlib.view.FillContentLayout>



            <TextView

                style="@style/TextAppearance.FingerprintErrorText"

res/layout/fingerprint_enroll_enrolling_content.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
<com.android.settings.widget.RingProgressBar

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

    android:id="@+id/fingerprint_progress_bar"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@drawable/fp_illustration"

    android:minHeight="@dimen/fingerprint_progress_bar_min_size"

    android:progress="0" />

res/layout/fingerprint_enroll_finish_base.xml

+32 −14
Original line number Diff line number Diff line
@@ -41,23 +41,41 @@ 
            android:minLines="3"

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



        <com.android.setupwizardlib.view.FillContentLayout

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="0dp"

            android:layout_weight="1"

            android:maxWidth="@dimen/fingerprint_finish_max_size"

            android:maxHeight="@dimen/fingerprint_finish_max_size">

            android:gravity="center"

            android:orientation="vertical">



            <com.android.setupwizardlib.view.FillContentLayout

                android:layout_width="@dimen/fingerprint_progress_bar_max_size"

                android:layout_height="@dimen/fingerprint_progress_bar_max_size"

                android:layout_marginVertical="24dp"

                android:paddingTop="0dp"

                android:paddingBottom="0dp"

                android:gravity="center|center_horizontal">



                <ImageView

                    android:id="@+id/fingerprint_in_app_indicator"

                    style="@style/SuwContentIllustration"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:padding="7dp"

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

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



            </com.android.setupwizardlib.view.FillContentLayout>



            <!-- Added to align elements with fingerprint_enroll_enrolling_base -->

            <TextView

                style="@style/TextAppearance.FingerprintErrorText"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal|bottom"

                android:visibility="invisible" />



        </LinearLayout>



    </LinearLayout>



</com.android.setupwizardlib.GlifLayout>