From aa1d403ea5d1b937cdaa06c75612102466ca41ca Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 19 Aug 2025 11:59:14 -0400 Subject: [PATCH] v3.2.2: removed Android landscape setting, now uses system orientation --- android/src/main/AndroidManifest.xml | 1 - .../android/AndroidLauncher.java | 8 ----- .../android/AndroidPlatformSupport.java | 7 +---- .../shatteredpixeldungeon/SPDSettings.java | 15 ---------- .../windows/WndSettings.java | 30 ------------------- 5 files changed, 1 insertion(+), 60 deletions(-) diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index f05d11a62..d7ecedb5d 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -31,7 +31,6 @@ android:backupAgent=".AndroidBackupHandler"> diff --git a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidLauncher.java b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidLauncher.java index 4e4b410c6..f73f0f4ec 100644 --- a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidLauncher.java +++ b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidLauncher.java @@ -24,7 +24,6 @@ package com.shatteredpixel.shatteredpixeldungeon.android; import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; -import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; @@ -122,13 +121,6 @@ public class AndroidLauncher extends AndroidApplication { }); } - //set desired orientation (if it exists) before initializing the app. - if (SPDSettings.landscape() != null) { - instance.setRequestedOrientation( SPDSettings.landscape() ? - ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : - ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT ); - } - AndroidApplicationConfiguration config = new AndroidApplicationConfiguration(); config.depth = 0; diff --git a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java index 5054c3a07..4dd37998b 100644 --- a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java +++ b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java @@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.android; import android.annotation.SuppressLint; import android.content.Context; -import android.content.pm.ActivityInfo; import android.net.ConnectivityManager; import android.os.Build; import android.view.View; @@ -43,11 +42,7 @@ import java.util.regex.Pattern; public class AndroidPlatformSupport extends PlatformSupport { public void updateDisplaySize(){ - if (SPDSettings.landscape() != null) { - AndroidLauncher.instance.setRequestedOrientation( SPDSettings.landscape() ? - ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : - ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT ); - } + //TODO seem to be existing bugs with handling split screen here, should look into that } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/SPDSettings.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/SPDSettings.java index 9473690e1..3219090cd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/SPDSettings.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/SPDSettings.java @@ -67,21 +67,6 @@ public class SPDSettings extends GameSettings { return getBoolean( KEY_FULLSCREEN, DeviceCompat.isDesktop() ); } - public static void landscape( boolean value ){ - put( KEY_LANDSCAPE, value ); - ((ShatteredPixelDungeon)ShatteredPixelDungeon.instance).updateDisplaySize(); - } - - //can return null because we need to directly handle the case of landscape not being set - // as there are different defaults for different devices - public static Boolean landscape(){ - if (contains(KEY_LANDSCAPE)){ - return getBoolean(KEY_LANDSCAPE, false); - } else { - return null; - } - } - public static void zoom( int value ) { put( KEY_ZOOM, value ); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java index 608e2415a..9c48d620d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java @@ -220,8 +220,6 @@ public class WndSettings extends WndTabbed { RenderedTextBlock title; ColorBlock sep1; CheckBox chkFullscreen; - OptionSlider optScale; - RedButton btnOrientation; ColorBlock sep2; OptionSlider optBrightness; OptionSlider optVisGrid; @@ -252,24 +250,6 @@ public class WndSettings extends WndTabbed { } add(chkFullscreen); - //TODO change to respect auto-rotation when updating Android SDK? - if (DeviceCompat.isAndroid()) { - Boolean landscape = SPDSettings.landscape(); - if (landscape == null){ - landscape = Game.width > Game.height; - } - Boolean finalLandscape = landscape; - btnOrientation = new RedButton(finalLandscape ? - Messages.get(this, "portrait") - : Messages.get(this, "landscape")) { - @Override - protected void onClick() { - SPDSettings.landscape(!finalLandscape); - } - }; - add(btnOrientation); - } - sep2 = new ColorBlock(1, 1, 0xFF000000); add(sep2); @@ -329,16 +309,6 @@ public class WndSettings extends WndTabbed { chkFullscreen.setRect(0, bottom + GAP, width, BTN_HEIGHT); bottom = chkFullscreen.bottom(); - if (btnOrientation != null) { - btnOrientation.setRect(0, bottom + GAP, width, BTN_HEIGHT); - bottom = btnOrientation.bottom(); - } - - if (optScale != null){ - optScale.setRect(0, bottom + GAP, width, SLIDER_HEIGHT); - bottom = optScale.bottom(); - } - sep2.size(width, 1); sep2.y = bottom + GAP; bottom = sep2.y + 1;