diff options
| author | Léo Lam <leolino.lam@gmail.com> | 2018-01-24 12:14:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-24 12:14:21 +0100 |
| commit | c3dc8bf1c0fd8151fed6557a90a72040361ae394 (patch) | |
| tree | 990b62bee05a61da6935b653b101a9b2041040d1 /Source/Android/app/src/main/java | |
| parent | 9a166dca572d7220c345df030921bbd466381c91 (diff) | |
| parent | 53f2fcb57126eb337c5939f555907b6a18ed67c2 (diff) | |
Merge pull request #6310 from mahdihijazi/fix_animation
Android: Fix settings screen animation if Animator Duration Scale is Off
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java index cd942eb091..dfd63c2d9a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java @@ -5,6 +5,7 @@ import android.content.Context; 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 final class SettingsActivity extends AppCompatActivity implements Setting 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 final class SettingsActivity extends AppCompatActivity implements Setting 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) { |