From 181d4ed44c802a2e8f365532670f1e32a98a3bae Mon Sep 17 00:00:00 2001 From: Matthias Yzusqui Date: Sun, 4 Mar 2018 19:45:04 +0100 Subject: Eleven: default android animations for activities and fragments - use the default android 'slide-up + fade-in' animation for activities - get rid of the custom fade_out animation for fragments as it is causing a buggy double close effect. Change-Id: I597985b11a35e2a3d0e6c764aa09d26e97a24b70 --- res/anim/fade_out.xml | 33 ---------------------- .../eleven/ui/activities/BaseActivity.java | 3 -- .../eleven/ui/activities/HomeActivity.java | 1 - .../eleven/ui/activities/SearchActivity.java | 3 -- .../eleven/ui/activities/SettingsActivity.java | 2 -- 5 files changed, 42 deletions(-) delete mode 100644 res/anim/fade_out.xml diff --git a/res/anim/fade_out.xml b/res/anim/fade_out.xml deleted file mode 100644 index 5b0a5da..0000000 --- a/res/anim/fade_out.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/org/lineageos/eleven/ui/activities/BaseActivity.java b/src/org/lineageos/eleven/ui/activities/BaseActivity.java index efc6580..da0eeba 100644 --- a/src/org/lineageos/eleven/ui/activities/BaseActivity.java +++ b/src/org/lineageos/eleven/ui/activities/BaseActivity.java @@ -112,9 +112,6 @@ public abstract class BaseActivity extends FragmentActivity implements ServiceCo protected void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // Fade it in - overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); - // Control the media volume setVolumeControlStream(AudioManager.STREAM_MUSIC); diff --git a/src/org/lineageos/eleven/ui/activities/HomeActivity.java b/src/org/lineageos/eleven/ui/activities/HomeActivity.java index 72d651a..b6ceadb 100644 --- a/src/org/lineageos/eleven/ui/activities/HomeActivity.java +++ b/src/org/lineageos/eleven/ui/activities/HomeActivity.java @@ -284,7 +284,6 @@ public class HomeActivity extends SlidingPanelActivity implements if (targetFragment != null) { targetFragment.setArguments(intent.getExtras()); - transaction.setCustomAnimations(0, 0, 0, R.anim.fade_out); // If we ever come back to this because of memory concerns because // none of the fragments are being removed from memory, we can fix this // by using "replace" instead of "add". The caveat is that the performance of diff --git a/src/org/lineageos/eleven/ui/activities/SearchActivity.java b/src/org/lineageos/eleven/ui/activities/SearchActivity.java index 63dcf86..94dd78f 100644 --- a/src/org/lineageos/eleven/ui/activities/SearchActivity.java +++ b/src/org/lineageos/eleven/ui/activities/SearchActivity.java @@ -253,9 +253,6 @@ public class SearchActivity extends FragmentActivity implements } }; - // Fade it in - overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); - // Control the media volume setVolumeControlStream(AudioManager.STREAM_MUSIC); diff --git a/src/org/lineageos/eleven/ui/activities/SettingsActivity.java b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java index 095e64a..b363d02 100644 --- a/src/org/lineageos/eleven/ui/activities/SettingsActivity.java +++ b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java @@ -44,8 +44,6 @@ public class SettingsActivity extends PreferenceActivity implements OnSharedPref @Override protected void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // Fade it in - overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); // UP getActionBar().setDisplayHomeAsUpEnabled(true); -- cgit v1.2.3