VERY experimental Nintendo Switch 2 emulator
C++
android: Remove deprecated use of onBackPressed()
Charles Lombardoa7fa14edd35b
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.ktindex 5c6f7eec55..7831228609 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt@@ -15,6 +15,7 @@ import androidx.core.view.ViewCompatimport androidx.core.view.WindowCompatimport androidx.core.view.WindowInsetsCompatimport android.view.ViewGroup.MarginLayoutParams+import androidx.activity.OnBackPressedCallbackimport androidx.core.view.updatePaddingimport com.google.android.material.color.MaterialColorsimport org.yuzu.yuzu_emu.NativeLibrary@@ -70,14 +71,28 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {)}+ onBackPressedDispatcher.addCallback(+ this,+ object : OnBackPressedCallback(true) {+ override fun handleOnBackPressed() = navigateBack()+ })+setInsets()}override fun onSupportNavigateUp(): Boolean {- onBackPressed()+ navigateBack()return true}+ private fun navigateBack() {+ if (supportFragmentManager.backStackEntryCount > 0) {+ supportFragmentManager.popBackStack()+ } else {+ finish()+ }+ }+override fun onCreateOptionsMenu(menu: Menu): Boolean {val inflater = menuInflaterinflater.inflate(R.menu.menu_settings, menu)