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

Commit d4621f63 authored by Maurice Lam's avatar Maurice Lam
Browse files

resolve merge conflicts of f36b25c2 to stage-aosp-master 

Test: Existing tests pass
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I6e021d1156686aa30bdc051f1fefe16b5c619b80
parents 5973d32c f36b25c2

res/layout-land/fingerprint_enroll_find_sensor.xml

+48 −39
Original line number Diff line number Diff line
@@ -40,9 +40,16 @@ 
            android:clipToPadding="false"

            android:orientation="vertical">



            <LinearLayout

            <ScrollView

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:clipChildren="false"

                android:clipToPadding="false"

                android:fillViewport="true">



                <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:orientation="vertical"

                    android:clipChildren="false"

                    android:clipToPadding="false">
@@ -86,6 +93,8 @@ 


                </LinearLayout>



            </ScrollView>



        </LinearLayout>



        <FrameLayout