FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme
Change-Id: I152a777b60ac6bfb4c8e1399e31cc0d4b2ab9758
Fixes: 65408626
Test: manual
diff --git a/res/layout/confirm_lock_password_internal.xml b/res/layout/confirm_lock_password_internal.xml
index 558522c..05bd4a0 100644
--- a/res/layout/confirm_lock_password_internal.xml
+++ b/res/layout/confirm_lock_password_internal.xml
@@ -81,10 +81,14 @@
android:visibility="gone"/>
<Button
- style="@style/SetupWizardButton.Negative"
android:id="@+id/cancelButton"
+ style="@style/SuwGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="?attr/suwMarginSides"
+ android:layout_marginEnd="?attr/suwMarginSides"
+ android:layout_marginBottom="80dp"
+ android:layout_gravity="center_horizontal"
android:text="@string/cancel" />
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout/confirm_lock_pattern_internal_base.xml b/res/layout/confirm_lock_pattern_internal_base.xml
index d0ce769..2b09a7e 100644
--- a/res/layout/confirm_lock_pattern_internal_base.xml
+++ b/res/layout/confirm_lock_pattern_internal_base.xml
@@ -100,16 +100,17 @@
android:contentDescription="@string/confirm_fingerprint_icon_content_description"
android:visibility="gone"/>
- </LinearLayout>
+ <Button
+ android:id="@+id/cancelButton"
+ style="@style/SuwGlifButton.Secondary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="?attr/suwMarginSides"
+ android:layout_marginEnd="?attr/suwMarginSides"
+ android:layout_marginBottom="80dp"
+ android:text="@string/cancel" />
- <Button
- android:id="@+id/cancelButton"
- style="@style/SuwGlifButton.Secondary"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="?attr/suwMarginSides"
- android:layout_marginEnd="?attr/suwMarginSides"
- android:text="@string/cancel" />
+ </LinearLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>