Merge pull request #6310 from mahdihijazi/fix_animation

Android: Fix settings screen animation if Animator Duration Scale is Off

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java

@@ -5,6 +5,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AppCompatActivity;
@@ -106,11 +107,14 @@ public void showSettingsFragment(String menuTag, boolean addToStack)
 
 		if (addToStack)
 		{
-			transaction.setCustomAnimations(
-					R.animator.settings_enter,
-					R.animator.settings_exit,
-					R.animator.settings_pop_enter,
-					R.animator.setttings_pop_exit);
+			if (areSystemAnimationsEnabled())
+			{
+				transaction.setCustomAnimations(
+						R.animator.settings_enter,
+						R.animator.settings_exit,
+						R.animator.settings_pop_enter,
+						R.animator.setttings_pop_exit);
+			}
 
 			transaction.addToBackStack(null);
 			mPresenter.addToStack();
@@ -120,6 +124,17 @@ public void showSettingsFragment(String menuTag, boolean addToStack)
 		transaction.commit();
 	}
 
+	private boolean areSystemAnimationsEnabled()
+	{
+		float duration = Settings.Global.getFloat(
+				getContentResolver(),
+				Settings.Global.ANIMATOR_DURATION_SCALE, 1);
+		float transition = Settings.Global.getFloat(
+				getContentResolver(),
+				Settings.Global.TRANSITION_ANIMATION_SCALE, 1);
+		return duration != 0 && transition != 0;
+	}
+
 	@Override
 	public void startDirectoryInitializationService(DirectoryStateReceiver receiver, IntentFilter filter)
 	{