From 0585194eaf64739e9c0bc183b9443c7e4d96c1b9 Mon Sep 17 00:00:00 2001 From: Timo T Date: Wed, 15 Jun 2022 15:59:58 +0200 Subject: [PATCH] Fix cutout options crash (#7169) --- android/src/com/unciv/app/AndroidLauncher.kt | 4 +--- .../src/com/unciv/app/PlatformSpecificHelpersAndroid.kt | 9 ++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/android/src/com/unciv/app/AndroidLauncher.kt b/android/src/com/unciv/app/AndroidLauncher.kt index c2ff5feffa..58f4518d0b 100644 --- a/android/src/com/unciv/app/AndroidLauncher.kt +++ b/android/src/com/unciv/app/AndroidLauncher.kt @@ -39,9 +39,7 @@ open class AndroidLauncher : AndroidApplication() { val platformSpecificHelper = PlatformSpecificHelpersAndroid(this) platformSpecificHelper.allowPortrait(settings.allowAndroidPortrait) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { - platformSpecificHelper.toggleDisplayCutout(settings.androidCutout) - } + platformSpecificHelper.toggleDisplayCutout(settings.androidCutout) val androidParameters = UncivGameParameters( version = BuildConfig.VERSION_NAME, diff --git a/android/src/com/unciv/app/PlatformSpecificHelpersAndroid.kt b/android/src/com/unciv/app/PlatformSpecificHelpersAndroid.kt index a885366aeb..efbbd679a3 100644 --- a/android/src/com/unciv/app/PlatformSpecificHelpersAndroid.kt +++ b/android/src/com/unciv/app/PlatformSpecificHelpersAndroid.kt @@ -36,16 +36,15 @@ Sources for Info about current orientation in case need: } override fun hasDisplayCutout(): Boolean { - val displayCutout = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - activity.windowManager.defaultDisplay.cutout + return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + activity.windowManager.defaultDisplay.cutout != null } else { - TODO("VERSION.SDK_INT < Q") + false } - return displayCutout != null } - @RequiresApi(Build.VERSION_CODES.P) override fun toggleDisplayCutout(androidCutout: Boolean) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) return val layoutParams = activity.window.attributes if (androidCutout) { layoutParams.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES