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

Commit 3fafe7cf authored by Ajay Kumar Nadathur Sreenivasan's avatar Ajay Kumar Nadathur Sreenivasan Committed by android-build-merger
Browse files

Merge "Overlapping text over fingerprint animation" into oc-dr1-dev 

am: 56787e3e

Change-Id: Ic30a63d3043a04aeeac04d65a747897b91e1831b
parents ef7f6663 56787e3e

res/layout-land/fingerprint_enroll_enrolling.xml

+87 −78
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ 
    android:layout="@layout/suw_glif_blank_template"

    style="?attr/fingerprint_layout_theme">



    <ScrollView

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:fillViewport="true">

        <LinearLayout

            style="@style/SuwContentFrame"

            android:layout_width="match_parent"
@@ -97,10 +101,12 @@ 


            </LinearLayout>



        <FrameLayout

            <LinearLayout

                android:layout_width="0dp"

                android:layout_weight="1"

            android:layout_height="match_parent">

                android:layout_height="match_parent"

                android:gravity="center"

                android:orientation="vertical">



                <include layout="@layout/fingerprint_enroll_enrolling_content"

                    android:layout_width="match_parent"
@@ -115,10 +121,13 @@ 
                    android:layout_marginBottom="16dp"

                    android:layout_gravity="center_horizontal|bottom"

                    android:accessibilityLiveRegion="polite"

                    android:gravity="center_horizontal"

                    android:paddingEnd="5dp"

                    android:paddingStart="5dp"

                    android:visibility="invisible"/>



        </FrameLayout>



            </LinearLayout>



        </LinearLayout>

    </ScrollView>

</com.android.setupwizardlib.GlifLayout>

res/layout/fingerprint_enroll_enrolling_base.xml

+5 −4
Original line number Diff line number Diff line
@@ -57,10 +57,12 @@ 


        </FrameLayout>



        <FrameLayout

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1">

            android:layout_weight="1"

            android:gravity="center"

            android:orientation="vertical">



            <include layout="@layout/fingerprint_enroll_enrolling_content"

                android:layout_width="@dimen/fingerprint_progress_bar_max_size"
@@ -73,13 +75,12 @@ 
                android:id="@+id/error_text"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="24dp"

                android:layout_gravity="center_horizontal|bottom"

                android:accessibilityLiveRegion="polite"

                android:gravity="center"

                android:visibility="invisible"/>



        </FrameLayout>

        </LinearLayout>



    </LinearLayout>