From b7d0b27a8c3ce7e1827c26d84ab8f375aed9f273 Mon Sep 17 00:00:00 2001 From: zackhow Date: Tue, 30 Oct 2018 19:54:44 -0400 Subject: [PATCH] Android: fix landscape lock If emulation started in landscape then it wouldn't lock to landscape, thus allowing a rotation to portrait then immediately back to landscape. Also locking to landscape didn't need to be called from another thread, so that was removed as well --- .../activities/EmulationActivity.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index 1c9ac12953..1093c37a1a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -212,17 +212,13 @@ public final class EmulationActivity extends AppCompatActivity int themeId; if (mDeviceHasTouchScreen) { - // Force landscape - if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) - { - BooleanSetting lockLandscape = - (BooleanSetting) mSettings.getSection(Settings.SECTION_INI_CORE) - .getSetting(SettingsFile.KEY_LOCK_LANDSCAPE); - if (lockLandscape == null || lockLandscape.getValue()) - new Handler().postDelayed( - () -> setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE), - 100); - } + BooleanSetting lockLandscape = + (BooleanSetting) mSettings.getSection(Settings.SECTION_INI_CORE) + .getSetting(SettingsFile.KEY_LOCK_LANDSCAPE); + // Force landscape if set + if (lockLandscape == null || lockLandscape.getValue()) + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE); + themeId = R.style.DolphinEmulationBase; // Get a handle to the Window containing the UI.