From e35c0db89440f5a307d35442e5cc91dd056ffe7d Mon Sep 17 00:00:00 2001
From: Jay Newstrom <jaynewstrom@stripe.com>
Date: Mon, 6 Mar 2023 15:42:07 -0600
Subject: [PATCH 1/4] Fix an issue where the primary button got extra wide on
 configuration changes.

---
 .../fragment_primary_button_container.xml     | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/paymentsheet/res/layout/fragment_primary_button_container.xml b/paymentsheet/res/layout/fragment_primary_button_container.xml
index c65fd98c4b6..6245342a141 100644
--- a/paymentsheet/res/layout/fragment_primary_button_container.xml
+++ b/paymentsheet/res/layout/fragment_primary_button_container.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.stripe.android.paymentsheet.ui.PrimaryButton xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/primary_button"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/stripe_paymentsheet_primary_button_height"
-    android:layout_marginTop="@dimen/stripe_paymentsheet_button_container_spacing"
-    android:layout_marginStart="@dimen/stripe_paymentsheet_outer_spacing_horizontal"
-    android:layout_marginEnd="@dimen/stripe_paymentsheet_outer_spacing_horizontal"
-    android:text="@string/stripe_paymentsheet_pay_button_label"
-    android:visibility="gone" />
+    android:layout_height="wrap_content">
+    <!-- Needs to be wrapped in a FrameLayout to prevent layout issues after configuration changes. -->
+
+    <com.stripe.android.paymentsheet.ui.PrimaryButton
+        android:id="@+id/primary_button"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/stripe_paymentsheet_primary_button_height"
+        android:layout_marginTop="@dimen/stripe_paymentsheet_button_container_spacing"
+        android:layout_marginStart="@dimen/stripe_paymentsheet_outer_spacing_horizontal"
+        android:layout_marginEnd="@dimen/stripe_paymentsheet_outer_spacing_horizontal"
+        android:text="@string/stripe_paymentsheet_pay_button_label"
+        android:visibility="gone" />
+</FrameLayout>

From 3d80a6fe65db842b6c2b7fc4b62f8167e3051092 Mon Sep 17 00:00:00 2001
From: Jay Newstrom <jaynewstrom@stripe.com>
Date: Mon, 6 Mar 2023 15:43:43 -0600
Subject: [PATCH 2/4] Changelog.

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27e99602c53..6631a1caaec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## XX.XX.XX - 2023-XX-XX
 
+### PaymentSheet
+* [FIXED][63260](https://github.com/stripe/stripe-android/pull/6326) Fixed and issue where the pay button would lose it's padding on configuration changes.
+
 ## 20.19.5 - 2023-03-06
 
 ### Payments

From 1110ceb92683e7671ff4ea8aea44b7d6933d7fa7 Mon Sep 17 00:00:00 2001
From: Jay Newstrom <jaynewstrom@stripe.com>
Date: Mon, 6 Mar 2023 15:53:57 -0600
Subject: [PATCH 3/4] apiDump.

---
 paymentsheet/api/paymentsheet.api | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paymentsheet/api/paymentsheet.api b/paymentsheet/api/paymentsheet.api
index dc01da71f6d..89cf3bf2cfa 100644
--- a/paymentsheet/api/paymentsheet.api
+++ b/paymentsheet/api/paymentsheet.api
@@ -1072,7 +1072,7 @@ public final class com/stripe/android/paymentsheet/databinding/FragmentPrimaryBu
 	public final field primaryButton Lcom/stripe/android/paymentsheet/ui/PrimaryButton;
 	public static fun bind (Landroid/view/View;)Lcom/stripe/android/paymentsheet/databinding/FragmentPrimaryButtonContainerBinding;
 	public synthetic fun getRoot ()Landroid/view/View;
-	public fun getRoot ()Lcom/stripe/android/paymentsheet/ui/PrimaryButton;
+	public fun getRoot ()Landroid/widget/FrameLayout;
 	public static fun inflate (Landroid/view/LayoutInflater;)Lcom/stripe/android/paymentsheet/databinding/FragmentPrimaryButtonContainerBinding;
 	public static fun inflate (Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Z)Lcom/stripe/android/paymentsheet/databinding/FragmentPrimaryButtonContainerBinding;
 }

From 9b2d75d20655c30ccd009cdf21df6df7d9564108 Mon Sep 17 00:00:00 2001
From: Jay Newstrom <jaynewstrom@stripe.com>
Date: Mon, 6 Mar 2023 16:22:05 -0600
Subject: [PATCH 4/4] Update CHANGELOG.md

Co-authored-by: Till Hellmund <tillh@stripe.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6631a1caaec..5cec8d4b1e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## XX.XX.XX - 2023-XX-XX
 
 ### PaymentSheet
-* [FIXED][63260](https://github.com/stripe/stripe-android/pull/6326) Fixed and issue where the pay button would lose it's padding on configuration changes.
+* [FIXED][6326](https://github.com/stripe/stripe-android/pull/6326) Fixed an issue where the primary button would lose its padding on configuration changes.
 
 ## 20.19.5 - 2023-03-06