From 169e78852497f4d8c9023e9c2d90ab9ba7604b4d Mon Sep 17 00:00:00 2001 From: James Woo Date: Mon, 11 Apr 2022 13:04:08 -0700 Subject: [PATCH] Remove force portrait for tablets --- CHANGELOG.md | 1 + payments-core/res/values-sw600dp/attrs.xml | 4 ++++ payments-core/res/values/attrs.xml | 2 ++ .../paymentlauncher/PaymentLauncherConfirmationActivity.kt | 5 ++++- 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 payments-core/res/values-sw600dp/attrs.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 80acfdd537d..4186627afe2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### PaymentSheet * [FIXED] [4861](https://github.com/stripe/stripe-android/pull/4861) Remove font resource to save space and default to system default +* [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 new file mode 100644 index 00000000000..8e66f10e898 --- /dev/null +++ b/payments-core/res/values-sw600dp/attrs.xml @@ -0,0 +1,4 @@ + + + true + diff --git a/payments-core/res/values/attrs.xml b/payments-core/res/values/attrs.xml index ea90e755283..1cf3268c84d 100644 --- a/payments-core/res/values/attrs.xml +++ b/payments-core/res/values/attrs.xml @@ -29,4 +29,6 @@ + + false diff --git a/payments-core/src/main/java/com/stripe/android/payments/paymentlauncher/PaymentLauncherConfirmationActivity.kt b/payments-core/src/main/java/com/stripe/android/payments/paymentlauncher/PaymentLauncherConfirmationActivity.kt index 82f433a523e..b3ddd151bc0 100644 --- a/payments-core/src/main/java/com/stripe/android/payments/paymentlauncher/PaymentLauncherConfirmationActivity.kt +++ b/payments-core/src/main/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