Merge "Add another fingerprint button not visible in landscape mode" into oc-dr1-dev

This commit is contained in:
TreeHugger Robot
2017-07-12 01:57:26 +00:00
committed by Android (Google) Code Review

View File

@@ -23,6 +23,11 @@
android:layout="@layout/suw_glif_blank_template" android:layout="@layout/suw_glif_blank_template"
style="?attr/fingerprint_layout_theme"> style="?attr/fingerprint_layout_theme">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
<LinearLayout <LinearLayout
style="@style/SuwContentFrame" style="@style/SuwContentFrame"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -44,6 +49,7 @@
style="@style/SuwGlifIcon" style="@style/SuwGlifIcon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="?attr/suwGlifHeaderGravity"
android:layout_marginLeft="0dp" android:layout_marginLeft="0dp"
android:layout_marginRight="0dp" android:layout_marginRight="0dp"
android:contentDescription="@null" android:contentDescription="@null"
@@ -117,5 +123,5 @@
</com.android.setupwizardlib.view.FillContentLayout> </com.android.setupwizardlib.view.FillContentLayout>
</LinearLayout> </LinearLayout>
</ScrollView>
</com.android.setupwizardlib.GlifLayout> </com.android.setupwizardlib.GlifLayout>