diff options
author | Matthias Yzusqui <myzb.dev@gmail.com> | 2018-03-04 19:45:04 +0100 |
---|---|---|
committer | Joey <joey@lineageos.org> | 2018-04-02 22:27:31 +0000 |
commit | 181d4ed44c802a2e8f365532670f1e32a98a3bae (patch) | |
tree | debe1b761b9107a57aaf0c066ecb281e6e89960b | |
parent | 68476c5e58689b1a99972bffc628fbd5a27eb7c0 (diff) | |
download | android_packages_apps_Eleven-181d4ed44c802a2e8f365532670f1e32a98a3bae.tar.gz android_packages_apps_Eleven-181d4ed44c802a2e8f365532670f1e32a98a3bae.tar.bz2 android_packages_apps_Eleven-181d4ed44c802a2e8f365532670f1e32a98a3bae.zip |
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
5 files changed, 0 insertions, 42 deletions
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 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* //device/apps/common/res/anim/fade_out.xml -** -** Copyright 2007, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<set xmlns:android="http://schemas.android.com/apk/res/android" - android:shareInterpolator="false" android:zAdjustment="top"> - <alpha android:fromAlpha="1.0" android:toAlpha="0.0" - android:interpolator="@android:interpolator/decelerate_cubic" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:duration="300"/> - <scale android:fromXScale="1.0" android:toXScale=".8" - android:fromYScale="1.0" android:toYScale=".8" - android:pivotX="50%p" android:pivotY="50%p" - android:interpolator="@android:interpolator/decelerate_cubic" - android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true" - android:duration="300"/> -</set>
\ 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); |