PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of f36b25c2df to stage-aosp-master

Browse Source 
Test: Existing tests pass
Merged-In: I8f6219ab22abad98111f016d633bf100dc3222ce
Change-Id: I6e021d1156686aa30bdc051f1fefe16b5c619b80
This commit is contained in:
Maurice Lam
2017-10-16 11:30:19 -07:00
parent 5973d32c77 f36b25c2df
commit d4621f6302
1 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/layout-land/fingerprint_enroll_find_sensor.xml
View File

@@ -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