Remove force portrait for tablets

stripe · Apr 12, 2022 · c4567a6 · c4567a6
1 parent 2d357d1
commit c4567a6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # CHANGELOG
 ## x.x.x - xxxx-xx-xx
 
+### PaymentSheet
+* [CHANGED] [4855](https://github.com/stripe/stripe-android/pull/4855) Remove force portrait mode for tablets.
+
 ## 20.0.1 - 2022-04-11
 This release includes several PaymentSheet bug fixes.
 

diff --git a/payments-core/res/values-sw600dp/attrs.xml b/payments-core/res/values-sw600dp/attrs.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="isTablet">true</bool>
+</resources>
diff --git a/payments-core/res/values/attrs.xml b/payments-core/res/values/attrs.xml
@@ -29,4 +29,6 @@
         </attr>
         <attr name="backgroundColorStateList" format="reference" />
     </declare-styleable>
+
+    <bool name="isTablet">false</bool>
 </resources>
diff --git a/...n/java/com/stripe/android/payments/paymentlauncher/PaymentLauncherConfirmationActivity.kt b/...n/java/com/stripe/android/payments/paymentlauncher/PaymentLauncherConfirmationActivity.kt
@@ -10,6 +10,7 @@ import androidx.activity.viewModels
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
+import com.stripe.android.R
 import com.stripe.android.view.AuthActivityStarterHost
 
 /**
@@ -36,7 +37,9 @@ internal class PaymentLauncherConfirmationActivity : AppCompatActivity() {
     @SuppressLint("SourceLockedOrientationActivity")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if (Build.VERSION.SDK_INT != Build.VERSION_CODES.O) {
+        if (Build.VERSION.SDK_INT != Build.VERSION_CODES.O &&
+            !resources.getBoolean(R.bool.isTablet)
+        ) {
             // In Oreo, Activities where `android:windowIsTranslucent=true` can't request
             // orientation. See https://stackoverflow.com/a/50832408/11103900
             requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT