From 7812de4adeb9530fa5591d3d6e42cd610e5231cc Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Mon, 22 May 2023 20:03:18 -0400 Subject: [PATCH] android: Remove deprecated use of onBackPressed() --- .../features/settings/ui/SettingsActivity.kt | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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.kt index 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.ViewCompat import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import android.view.ViewGroup.MarginLayoutParams +import androidx.activity.OnBackPressedCallback import androidx.core.view.updatePadding import com.google.android.material.color.MaterialColors import 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 = menuInflater inflater.inflate(R.menu.menu_settings, menu)