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

Commit 4aaa52d1 authored by Ajay Nadathur's avatar Ajay Nadathur Committed by android-build-merger
Browse files

Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev 

am: d1bac255

Change-Id: Ib5269308dfd159b0bf535421ae9bc65628aee3e6
parents 3d627974 d1bac255

res/layout/fingerprint_enroll_find_sensor_base.xml

+13 −22
Original line number Diff line number Diff line
@@ -24,23 +24,17 @@ 
    android:layout_height="match_parent"

    app:suwFooter="@layout/fingerprint_enroll_find_sensor_base_footer">



    <FrameLayout

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical"

        android:clipToPadding="false"

        android:clipChildren="false">



        <include

            layout="@layout/fingerprint_enroll_find_sensor_graphic"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="center_horizontal|bottom"/>



        <LinearLayout

            style="@style/SuwContentFrame"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:clipToPadding="false"

            android:clipChildren="false">
@@ -51,21 +45,18 @@ 
                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/suw_description_glif_margin_top"

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

        </LinearLayout>



            <View

        <Space

            android:layout_width="wrap_content"

            android:layout_height="0dp"

                android:layout_width="match_parent"

            android:layout_weight="1" />



            <Button

                style="@style/SuwGlifButton.Secondary"

                android:id="@+id/next_button"

                android:layout_width="wrap_content"

        <include

            layout="@layout/fingerprint_enroll_find_sensor_graphic"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

                android:layout_marginBottom="4dp"

                android:layout_gravity="end"

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

            android:layout_gravity="center_horizontal"/>



    </LinearLayout>

    </FrameLayout>

</com.android.setupwizardlib.GlifLayout>