diff options
| author | mahdihijazi <mahdi.hijaz@hotmail.com> | 2018-01-18 19:18:37 +0100 |
|---|---|---|
| committer | mahdihijazi <mahdi.hijaz@hotmail.com> | 2018-01-19 11:55:20 +0100 |
| commit | 53f2fcb57126eb337c5939f555907b6a18ed67c2 (patch) | |
| tree | 0199b87c554fb226b25afac60ab5e68417719cf1 /Source/Android/app/src/main/java | |
| parent | 55584bf45618fd34fc5a3a3740c09597bb1e83bc (diff) | |
Android: Fix settings screen animation if Animator Duration Scale is Off
If Animator Duration Scale is Off, the Enhancements/Hacks screens were
not visible unless you enable the Animator Duration Scale back. This
make sure screens will be visible regardless of your animation settings.
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) { |