Merge pull request #9034 from JosJuice/android-menu-animation-rtl

Android: Take RTL layout into account for menu animations

9 files changed, 90 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();
diff --git a/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_in_from_end.xml b/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_in_from_end.xml
new file mode 100644
index 0000000000..cdd11fc2d9
--- /dev/null
+++ b/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_in_from_end.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <objectAnimator
+        android:propertyName="translationX"
+        android:valueType="floatType"
+        android:valueFrom="-1280dp"
+        android:valueTo="0"
+        android:interpolator="@android:interpolator/decelerate_quad"
+        android:duration="300"/>
+
+    <objectAnimator
+        android:propertyName="alpha"
+        android:valueType="floatType"
+        android:valueFrom="0"
+        android:valueTo="1"
+        android:interpolator="@android:interpolator/accelerate_quad"
+        android:duration="300"/>
+
+</set>
diff --git a/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_in_from_start.xml b/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_in_from_start.xml
new file mode 100644
index 0000000000..2acbf1270c
--- /dev/null
+++ b/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_in_from_start.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <objectAnimator
+        android:propertyName="translationX"
+        android:valueType="floatType"
+        android:valueFrom="1280dp"
+        android:valueTo="0"
+        android:interpolator="@android:interpolator/decelerate_quad"
+        android:duration="300"/>
+
+    <objectAnimator
+        android:propertyName="alpha"
+        android:valueType="floatType"
+        android:valueFrom="0"
+        android:valueTo="1"
+        android:interpolator="@android:interpolator/accelerate_quad"
+        android:duration="300"/>
+
+</set>
diff --git a/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_end.xml b/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_end.xml
new file mode 100644
index 0000000000..eadf33156c
--- /dev/null
+++ b/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_end.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- This animation is used ONLY when a submenu is replaced. -->
+    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+        android:propertyName="translationX"
+        android:valueType="floatType"
+        android:valueFrom="0"
+        android:valueTo="-1280dp"
+        android:interpolator="@android:interpolator/decelerate_quad"
+        android:duration="200"/>
+
+    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+        android:propertyName="alpha"
+        android:valueType="floatType"
+        android:valueFrom="1"
+        android:valueTo="0"
+        android:interpolator="@android:interpolator/decelerate_quad"
+        android:duration="200"/>
+
+</set>
diff --git a/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_start.xml b/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_start.xml
new file mode 100644
index 0000000000..d650237d6f
--- /dev/null
+++ b/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_start.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- This animation is used ONLY when a submenu is replaced. -->
+    <objectAnimator
+        android:propertyName="translationX"
+        android:valueType="floatType"
+        android:valueFrom="0"
+        android:valueTo="1280dp"
+        android:interpolator="@android:interpolator/decelerate_quad"
+        android:duration="200"/>
+
+    <objectAnimator
+        android:propertyName="alpha"
+        android:valueType="floatType"
+        android:valueFrom="1"
+        android:valueTo="0"
+        android:interpolator="@android:interpolator/decelerate_quad"
+        android:duration="200"/>
+
+</set>
diff --git a/Source/Android/app/src/main/res/animator/menu_slide_in_from_right.xml b/Source/Android/app/src/main/res/animator/menu_slide_in_from_end.xml
index 3f1495c757..3f1495c757 100644
--- a/Source/Android/app/src/main/res/animator/menu_slide_in_from_right.xml
+++ b/Source/Android/app/src/main/res/animator/menu_slide_in_from_end.xml
diff --git a/Source/Android/app/src/main/res/animator/menu_slide_in_from_left.xml b/Source/Android/app/src/main/res/animator/menu_slide_in_from_start.xml
index 4612aee134..4612aee134 100644
--- a/Source/Android/app/src/main/res/animator/menu_slide_in_from_left.xml
+++ b/Source/Android/app/src/main/res/animator/menu_slide_in_from_start.xml
diff --git a/Source/Android/app/src/main/res/animator/menu_slide_out_to_right.xml b/Source/Android/app/src/main/res/animator/menu_slide_out_to_end.xml
index 5c38a06fd8..5c38a06fd8 100644
--- a/Source/Android/app/src/main/res/animator/menu_slide_out_to_right.xml
+++ b/Source/Android/app/src/main/res/animator/menu_slide_out_to_end.xml
diff --git a/Source/Android/app/src/main/res/animator/menu_slide_out_to_left.xml b/Source/Android/app/src/main/res/animator/menu_slide_out_to_start.xml
index c004789466..c004789466 100644
--- a/Source/Android/app/src/main/res/animator/menu_slide_out_to_left.xml
+++ b/Source/Android/app/src/main/res/animator/menu_slide_out_to_start.xml