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 
am: d4621f6302

Change-Id: I7f2e89579a99523808138eaabffa917b1e02e3b0
This commit is contained in:
Maurice Lam
2017-10-16 19:22:12 +00:00
committed by android-build-merger
parent f1dc9e65f1 d4621f6302
commit 0e1c486e74
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:clipToPadding="false"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="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:orientation="vertical"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false"> android:clipToPadding="false">
@@ -86,6 +93,8 @@
</LinearLayout> </LinearLayout>
</ScrollView>
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout