Merge "Stack fingerprint buttons on small screens"

This commit is contained in:
TreeHugger Robot
2018-04-10 20:13:29 +00:00
committed by Android (Google) Code Review
2 changed files with 8 additions and 6 deletions

View File

@@ -16,8 +16,9 @@
--> -->
<!-- TODO: Use aapt:attr when it is fixed (b/36809755) --> <!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <com.android.setupwizardlib.view.ButtonBarLayout
style="@style/SuwGlifButtonBar" xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SuwGlifButtonBar.Stackable"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -40,4 +41,4 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/security_settings_fingerprint_enroll_done" /> android:text="@string/security_settings_fingerprint_enroll_done" />
</LinearLayout> </com.android.setupwizardlib.view.ButtonBarLayout>

View File

@@ -16,8 +16,9 @@
--> -->
<!-- TODO: Use aapt:attr when it is fixed (b/36809755) --> <!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <com.android.setupwizardlib.view.ButtonBarLayout
style="@style/SuwGlifButtonBar" xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/SuwGlifButtonBar.Stackable"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -40,4 +41,4 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/suw_next_button_label" /> android:text="@string/suw_next_button_label" />
</LinearLayout> </com.android.setupwizardlib.view.ButtonBarLayout>