Browse Source
Merge pull request #12699 from t895/overlay-saving
android: Save overlay data while using emulation fragment
pull/15/merge
liamwhite
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
4 additions and
7 deletions
-
src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
-
src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
|
|
|
@ -49,7 +49,6 @@ import org.yuzu.yuzu_emu.utils.ForegroundService |
|
|
|
import org.yuzu.yuzu_emu.utils.InputHandler |
|
|
|
import org.yuzu.yuzu_emu.utils.Log |
|
|
|
import org.yuzu.yuzu_emu.utils.MemoryUtil |
|
|
|
import org.yuzu.yuzu_emu.utils.NativeConfig |
|
|
|
import org.yuzu.yuzu_emu.utils.NfcReader |
|
|
|
import org.yuzu.yuzu_emu.utils.ThemeHelper |
|
|
|
import java.text.NumberFormat |
|
|
|
@ -171,11 +170,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener { |
|
|
|
stopMotionSensorListener() |
|
|
|
} |
|
|
|
|
|
|
|
override fun onStop() { |
|
|
|
super.onStop() |
|
|
|
NativeConfig.saveGlobalConfig() |
|
|
|
} |
|
|
|
|
|
|
|
override fun onUserLeaveHint() { |
|
|
|
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { |
|
|
|
if (BooleanSetting.PICTURE_IN_PICTURE.getBoolean() && !isInPictureInPictureMode) { |
|
|
|
|
|
|
|
@ -554,6 +554,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { |
|
|
|
findItem(R.id.menu_touchscreen).isChecked = BooleanSetting.TOUCHSCREEN.getBoolean() |
|
|
|
} |
|
|
|
|
|
|
|
popup.setOnDismissListener { NativeConfig.saveGlobalConfig() } |
|
|
|
popup.setOnMenuItemClickListener { |
|
|
|
when (it.itemId) { |
|
|
|
R.id.menu_toggle_fps -> { |
|
|
|
@ -720,7 +721,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { |
|
|
|
MaterialAlertDialogBuilder(requireContext()) |
|
|
|
.setTitle(R.string.emulation_control_adjust) |
|
|
|
.setView(adjustBinding.root) |
|
|
|
.setPositiveButton(android.R.string.ok, null) |
|
|
|
.setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int -> |
|
|
|
NativeConfig.saveGlobalConfig() |
|
|
|
} |
|
|
|
.setNeutralButton(R.string.slider_default) { _: DialogInterface?, _: Int -> |
|
|
|
setControlScale(50) |
|
|
|
setControlOpacity(100) |
|
|
|
|
