Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of f36b25c2df to stage-aosp-master am: d4621f6302

Browse Source 
am: 0e1c486e74

Change-Id: I9b94c26c4df2329e388eeb925350a2446ef9148e
This commit is contained in:
Maurice Lam
2017-10-16 19:25:57 +00:00
committed by android-build-merger
parent ab80b6ee9c 0e1c486e74
commit c03cf0092e
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