summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2022-12-06 22:11:38 +0100
committerGitHub <noreply@github.com>2022-12-06 22:11:38 +0100
commit2a23aab25418fc4587b7a8480283b68a9d13eeb9 (patch)
treecb54b7747e7dda84a9a15b6a1a39ae085d9f6cd8 /Source/Android/app/src/main/java
parentd34c4c67c8cc51797824931ae12d2b3b3f325898 (diff)
parentb9d05c4668c59c21b342d31a6b839e16c8661504 (diff)
Merge pull request #11327 from t895/settings-animation
Android: New settings fragment animations
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
index 7e40db37da..17e53da132 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
@@ -167,10 +167,10 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
if (areSystemAnimationsEnabled())
{
transaction.setCustomAnimations(
- R.animator.settings_enter,
- R.animator.settings_exit,
- R.animator.settings_pop_enter,
- R.animator.setttings_pop_exit);
+ R.anim.anim_settings_fragment_in,
+ R.anim.anim_settings_fragment_out,
+ 0,
+ R.anim.anim_pop_settings_fragment_out);
}
transaction.addToBackStack(null);