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); diff --git a/Source/Android/app/src/main/res/anim-ldrtl/anim_pop_settings_fragment_out.xml b/Source/Android/app/src/main/res/anim-ldrtl/anim_pop_settings_fragment_out.xml new file mode 100644 index 0000000000..9f49c133a0 --- /dev/null +++ b/Source/Android/app/src/main/res/anim-ldrtl/anim_pop_settings_fragment_out.xml @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/Source/Android/app/src/main/res/anim-ldrtl/anim_settings_fragment_in.xml b/Source/Android/app/src/main/res/anim-ldrtl/anim_settings_fragment_in.xml new file mode 100644 index 0000000000..82fd719dba --- /dev/null +++ b/Source/Android/app/src/main/res/anim-ldrtl/anim_settings_fragment_in.xml @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/Source/Android/app/src/main/res/anim/anim_pop_settings_fragment_out.xml b/Source/Android/app/src/main/res/anim/anim_pop_settings_fragment_out.xml new file mode 100644 index 0000000000..5892128f18 --- /dev/null +++ b/Source/Android/app/src/main/res/anim/anim_pop_settings_fragment_out.xml @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/Source/Android/app/src/main/res/anim/anim_settings_fragment_in.xml b/Source/Android/app/src/main/res/anim/anim_settings_fragment_in.xml new file mode 100644 index 0000000000..98e0cf8bd6 --- /dev/null +++ b/Source/Android/app/src/main/res/anim/anim_settings_fragment_in.xml @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/Source/Android/app/src/main/res/anim/anim_settings_fragment_out.xml b/Source/Android/app/src/main/res/anim/anim_settings_fragment_out.xml new file mode 100644 index 0000000000..77a40a4d1b --- /dev/null +++ b/Source/Android/app/src/main/res/anim/anim_settings_fragment_out.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/Source/Android/app/src/main/res/anim/fade_in.xml b/Source/Android/app/src/main/res/anim/fade_in.xml index 3767d530d5..b1eff22b7a 100644 --- a/Source/Android/app/src/main/res/anim/fade_in.xml +++ b/Source/Android/app/src/main/res/anim/fade_in.xml @@ -1,18 +1,20 @@ - - - \ No newline at end of file + + + + + diff --git a/Source/Android/app/src/main/res/anim/fade_out.xml b/Source/Android/app/src/main/res/anim/fade_out.xml index fab1686871..20bd65e395 100644 --- a/Source/Android/app/src/main/res/anim/fade_out.xml +++ b/Source/Android/app/src/main/res/anim/fade_out.xml @@ -1,18 +1,20 @@ - - - \ No newline at end of file + + + + + diff --git a/Source/Android/app/src/main/res/animator/settings_enter.xml b/Source/Android/app/src/main/res/animator/settings_enter.xml deleted file mode 100644 index 23ba7b802b..0000000000 --- a/Source/Android/app/src/main/res/animator/settings_enter.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/Source/Android/app/src/main/res/animator/settings_exit.xml b/Source/Android/app/src/main/res/animator/settings_exit.xml deleted file mode 100644 index fece2c34ea..0000000000 --- a/Source/Android/app/src/main/res/animator/settings_exit.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/Source/Android/app/src/main/res/animator/settings_pop_enter.xml b/Source/Android/app/src/main/res/animator/settings_pop_enter.xml deleted file mode 100644 index 36c8a27e7a..0000000000 --- a/Source/Android/app/src/main/res/animator/settings_pop_enter.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/Source/Android/app/src/main/res/animator/setttings_pop_exit.xml b/Source/Android/app/src/main/res/animator/setttings_pop_exit.xml deleted file mode 100644 index dd16018f23..0000000000 --- a/Source/Android/app/src/main/res/animator/setttings_pop_exit.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - \ No newline at end of file