Browse Source

DO NOT MERGE

Signed-off-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
pull/2761/head
Caio Oliveira 5 months ago
parent
commit
e0b36a0a9d
No known key found for this signature in database GPG Key ID: 362DA3DC1901E080
  1. 7
      src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
  2. 8
      src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt

7
src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt

@ -203,7 +203,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
override fun onDestroy() { override fun onDestroy() {
super.onDestroy() super.onDestroy()
stopForegroundService(this) stopForegroundService(this)
NativeLibrary.playTimeManagerStop()
} }
override fun onUserLeaveHint() { override fun onUserLeaveHint() {
@ -327,11 +327,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
override fun onAccuracyChanged(sensor: Sensor, i: Int) {} override fun onAccuracyChanged(sensor: Sensor, i: Int) {}
override fun onDestroy() {
super.onDestroy()
NativeLibrary.playTimeManagerStop()
}
private fun enableFullscreenImmersive() { private fun enableFullscreenImmersive() {
WindowCompat.setDecorFitsSystemWindows(window, false) WindowCompat.setDecorFitsSystemWindows(window, false)

8
src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt

@ -432,6 +432,10 @@ class GamePropertiesFragment : Fragment() {
SubmenuProperty( SubmenuProperty(
R.string.reset_playtime, R.string.reset_playtime,
R.string.reset_playtime_description, R.string.reset_playtime_description,
R.drawable.ic_delete,
actions = listOf(
SubMenuPropertySecondaryAction(
R.string.reset_playtime,
R.drawable.ic_delete R.drawable.ic_delete
) { ) {
MessageDialogFragment.newInstance( MessageDialogFragment.newInstance(
@ -439,7 +443,7 @@ class GamePropertiesFragment : Fragment() {
titleId = R.string.reset_playtime, titleId = R.string.reset_playtime,
descriptionId = R.string.reset_playtime_warning_description, descriptionId = R.string.reset_playtime_warning_description,
positiveAction = { positiveAction = {
NativeLibrary.playTimeManagerResetProgramPlayTime( args.game.programId)
NativeLibrary.playTimeManagerResetProgramPlayTime(args.game.programId)
Toast.makeText( Toast.makeText(
YuzuApplication.appContext, YuzuApplication.appContext,
R.string.playtime_reset_successfully, R.string.playtime_reset_successfully,
@ -451,6 +455,8 @@ class GamePropertiesFragment : Fragment() {
).show(parentFragmentManager, MessageDialogFragment.TAG) ).show(parentFragmentManager, MessageDialogFragment.TAG)
} }
) )
)
)
} }
} }
} }

Loading…
Cancel
Save