Emulator-Archive/PabloMK7-Citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2024-11-27 00:00:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "android: implement device rotation options (#182)" (#194)

Browse Source 
This reverts commit 93025c95f2.
This commit is contained in:
PabloMK7 2024-07-16 12:50:12 +02:00 committed by GitHub
parent eafb03ad38
commit 9de19ff7a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 4 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt
View File

@ -35,8 +35,6 @@ import org.citra.citra_emu.display.ScreenAdjustmentUtil
import org.citra.citra_emu.features.hotkeys.HotkeyUtility
import org.citra.citra_emu.features.settings.model.SettingsViewModel
import org.citra.citra_emu.features.settings.model.view.InputBindingSetting
import org.citra.citra_emu.features.settings.model.IntSetting
import org.citra.citra_emu.features.settings.model.Settings
import org.citra.citra_emu.fragments.MessageDialogFragment
import org.citra.citra_emu.utils.ControllerMappingHelper
import org.citra.citra_emu.utils.FileBrowserHelper
@ -62,10 +60,7 @@ class EmulationActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
ThemeUtil.setTheme(this)
isActivityRecreated = savedInstanceState != null
if (!isActivityRecreated) {
settingsViewModel.settings.loadSettings()
}
settingsViewModel.settings.loadSettings()
super.onCreate(savedInstanceState)
@ -79,6 +74,8 @@ class EmulationActivity : AppCompatActivity() {
val navController = navHostFragment.navController
navController.setGraph(R.navigation.emulation_navigation, intent.extras)
isActivityRecreated = savedInstanceState != null
// Set these options now so that the SurfaceView the game renders into is the right size.
enableFullscreenImmersive()
@ -178,11 +175,6 @@ class EmulationActivity : AppCompatActivity() {
controller.systemBarsBehavior =
WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
}
val orientation = settingsViewModel.settings.getSection(Settings.SECTION_RENDERER)
?.getSetting(IntSetting.DEVICE_ORIENTATION.key) as IntSetting
this.requestedOrientation = orientation.int
}
// Gets button presses

5
src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntSetting.kt
View File

@ -4,8 +4,6 @@
package org.citra.citra_emu.features.settings.model
import android.content.pm.ActivityInfo
enum class IntSetting(
override val key: String,
override val section: String,
@ -43,8 +41,7 @@ enum class IntSetting(
DEBUG_RENDERER("renderer_debug", Settings.SECTION_DEBUG, 0),
TEXTURE_FILTER("texture_filter", Settings.SECTION_RENDERER, 0),
USE_FRAME_LIMIT("use_frame_limit", Settings.SECTION_RENDERER, 1),
DELAY_RENDER_THREAD_US("delay_game_render_thread_us", Settings.SECTION_RENDERER, 0),
DEVICE_ORIENTATION("default_device_orientation", Settings.SECTION_RENDERER, ActivityInfo.SCREEN_ORIENTATION_USER);
DELAY_RENDER_THREAD_US("delay_game_render_thread_us", Settings.SECTION_RENDERER, 0);
override var int: Int = defaultValue

14
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt
View File

@ -173,20 +173,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
private fun addGeneralSettings(sl: ArrayList<SettingsItem>) {
settingsActivity.setToolbarTitle(settingsActivity.getString(R.string.preferences_general))
sl.apply {
add(HeaderSetting(R.string.graphics_ui))
add(
SingleChoiceSetting(
IntSetting.DEVICE_ORIENTATION,
R.string.device_orientation_title,
R.string.device_orientation_description,
R.array.deviceOrientationEntries,
R.array.deviceOrientationValues,
IntSetting.DEVICE_ORIENTATION.key,
IntSetting.DEVICE_ORIENTATION.defaultValue,
)
)
add(HeaderSetting(R.string.emulator_speed))
add(
SwitchSetting(
IntSetting.USE_FRAME_LIMIT,

15
src/android/app/src/main/res/values/arrays.xml
View File

@ -191,21 +191,6 @@
<item>2</item>
</integer-array>
<string-array name="deviceOrientationEntries">
<item>@string/device_orientation_system</item>
<item>@string/device_orientation_landscape</item>
<item>@string/device_orientation_portrait</item>
<item>@string/device_orientation_auto</item>
</string-array>
<!-- See: https://developer.android.com/reference/android/content/pm/ActivityInfo#SCREEN_ORIENTATION_SENSOR-->
<integer-array name="deviceOrientationValues">
<item>2</item>
<item>6</item>
<item>7</item>
<item>4</item>
</integer-array>
<string-array name="systemFileRegions">
<item>@string/system_region_jpn</item>
<item>@string/system_region_usa</item>

10
src/android/app/src/main/res/values/strings.xml
View File

@ -204,8 +204,6 @@
<string name="image_flip">Flip</string>
<!-- Graphics settings strings -->
<string name="graphics_ui">UI</string>
<string name="emulator_speed">Speed</string>
<string name="renderer">Renderer</string>
<string name="graphics_api">Graphics API</string>
<string name="spirv_shader_gen">Enable SPIR-V shader generation</string>
@ -467,14 +465,6 @@
<string name="use_black_backgrounds">Black Backgrounds</string>
<string name="use_black_backgrounds_description">When using the dark theme, apply black backgrounds.</string>
<!-- Device Orientation -->
<string name="device_orientation_title">Screen Orientation</string>
<string name="device_orientation_description">How should your games be displayed?</string>
<string name="device_orientation_system">Follow System Setting</string>
<string name="device_orientation_landscape">Landscape</string>
<string name="device_orientation_portrait">Portrait</string>
<string name="device_orientation_auto">Automatic</string>
<!-- Clock types -->
<string name="device_clock">Device Clock</string>
<string name="simulated_clock">Simulated Clock</string>