summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorLC <mathew1800@gmail.com>2020-08-17 15:24:52 -0400
committerGitHub <noreply@github.com>2020-08-17 15:24:52 -0400
commit24ff8b8d1e747c0e358a73467b33e89abab7ca0b (patch)
tree773f9a6c3f1b98dab7169f4f7641ea625263d070 /Source/Android/app/src/main/java
parent55c931d6248c6dda5a8a9cbd332131255d62bc3f (diff)
parentac17e49243c670d5ac3466575e1b2a9e3912b3c8 (diff)
Merge pull request #9034 from JosJuice/android-menu-animation-rtl
Android: Take RTL layout into account for menu animations
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
index 2bed26a973..72f39dbe23 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -491,10 +491,10 @@ public final class EmulationActivity extends AppCompatActivity
Fragment fragment = MenuFragment.newInstance(mSelectedTitle);
getSupportFragmentManager().beginTransaction()
.setCustomAnimations(
- R.animator.menu_slide_in_from_left,
- R.animator.menu_slide_out_to_left,
- R.animator.menu_slide_in_from_left,
- R.animator.menu_slide_out_to_left)
+ R.animator.menu_slide_in_from_start,
+ R.animator.menu_slide_out_to_start,
+ R.animator.menu_slide_in_from_start,
+ R.animator.menu_slide_out_to_start)
.add(R.id.frame_menu, fragment)
.addToBackStack(BACKSTACK_NAME_MENU)
.commit();
@@ -1235,10 +1235,10 @@ public final class EmulationActivity extends AppCompatActivity
Fragment fragment = SaveLoadStateFragment.newInstance(saveOrLoad);
getSupportFragmentManager().beginTransaction()
.setCustomAnimations(
- R.animator.menu_slide_in_from_right,
- R.animator.menu_slide_out_to_right,
- R.animator.menu_slide_in_from_right,
- R.animator.menu_slide_out_to_right)
+ R.animator.menu_slide_in_from_end,
+ R.animator.menu_slide_out_to_end,
+ R.animator.menu_slide_in_from_end,
+ R.animator.menu_slide_out_to_end)
.replace(R.id.frame_submenu, fragment)
.addToBackStack(BACKSTACK_NAME_SUBMENU)
.commit();