commit a857c8da4fcac98e70ea0d8d5b108aff24561341
author Maurice Lam <yukl@google.com> Wed Mar 29 21:10:15 2017 -0700
committer Maurice Lam <yukl@google.com> Fri Mar 31 11:54:39 2017 -0700
tree 5b1c8faf088beaf6a53e5e7dc016bc2ca1edc432
parent 2b37b43821f1d2cad57f5393be61ab29b87e5468

Sticky footer for GLIF theme

For settings screens using GLIF theme, update to sticky footers.

Test: Existing tests pass
Bug: 35448201
Change-Id: If26e7e25f7f02b4c24979503e0c9359b88ff16d1

res/layout/encryption_interstitial.xml

diff --git a/res/layout/encryption_interstitial.xml b/res/layout/encryption_interstitial.xml
index 331cdec..f827e37 100644
--- a/res/layout/encryption_interstitial.xml
+++ b/res/layout/encryption_interstitial.xml
@@ -17,9 +17,11 @@
 
 <com.android.setupwizardlib.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:icon="@drawable/ic_lock">
+    android:icon="@drawable/ic_lock"
+    app:suwFooter="@layout/encryption_interstitial_footer">
 
     <LinearLayout
         style="@style/SuwContentFrame"
@@ -35,35 +37,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:baselineAligned="false"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/encrypt_dont_require_password"
-                style="@style/SetupWizardButton.Negative"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/encryption_interstitial_no" />
-
-            <Space
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1" />
-
-            <Button
-                android:id="@+id/encrypt_require_password"
-                style="@style/SetupWizardButton.Positive"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/encryption_interstitial_yes" />
-
-        </LinearLayout>
-
     </LinearLayout>
 
 </com.android.setupwizardlib.GlifLayout>