Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 181d4ed4 authored by Matthias Yzusqui's avatar Matthias Yzusqui Committed by Joey
Browse files

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
parent 68476c5e

res/anim/fade_out.xml

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
<?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

src/org/lineageos/eleven/ui/activities/BaseActivity.java

+0 −3
Original line number Diff line number Diff line
@@ -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);

src/org/lineageos/eleven/ui/activities/HomeActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -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

src/org/lineageos/eleven/ui/activities/SearchActivity.java

+0 −3
Original line number Diff line number Diff line
@@ -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);

src/org/lineageos/eleven/ui/activities/SettingsActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -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);