From 6c7fcda0555c6dfc5df5d98f833812abdef42487 Mon Sep 17 00:00:00 2001 From: rahulsainani Date: Tue, 11 Apr 2023 12:10:09 +0200 Subject: [PATCH] Bug 1826944 - Onboarding now follows device orientation for tablets --- .../fenix/onboarding/JunoOnboardingFragment.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/JunoOnboardingFragment.kt b/app/src/main/java/org/mozilla/fenix/onboarding/JunoOnboardingFragment.kt index d3b82ef2a6..1d55b866b2 100644 --- a/app/src/main/java/org/mozilla/fenix/onboarding/JunoOnboardingFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/onboarding/JunoOnboardingFragment.kt @@ -45,7 +45,9 @@ class JunoOnboardingFragment : Fragment() { @SuppressLint("SourceLockedOrientationActivity") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT + if (isNotATablet()) { + activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT + } } @RequiresApi(Build.VERSION_CODES.TIRAMISU) @@ -69,7 +71,9 @@ class JunoOnboardingFragment : Fragment() { override fun onDestroy() { super.onDestroy() - activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED + if (isNotATablet()) { + activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED + } } @RequiresApi(Build.VERSION_CODES.TIRAMISU) @@ -169,4 +173,7 @@ class JunoOnboardingFragment : Fragment() { private fun shouldShowNotificationPage(context: Context) = !NotificationManagerCompat.from(context.applicationContext).areNotificationsEnabledSafe() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU + + private fun isNotATablet() = + !resources.getBoolean(R.bool.tablet) }