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

Commit 70eafab9 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Change dock animations to not use alpha, to make Mathias happy."

parents 24734bdd 8eedb8bf

core/java/com/android/internal/app/ActionBarImpl.java

+13 −4
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.Window;

import android.view.accessibility.AccessibilityEvent;

import android.view.animation.AnimationUtils;

import android.widget.SpinnerAdapter;



import java.lang.ref.WeakReference;
@@ -596,19 +597,23 @@ public class ActionBarImpl extends ActionBar { 
        if (mCurWindowVisibility == View.VISIBLE && (mShowHideAnimationEnabled

                || alwaysAnimate)) {

            mTopVisibilityView.setAlpha(0);

            mTopVisibilityView.setTranslationY(-mTopVisibilityView.getHeight());

            AnimatorSet anim = new AnimatorSet();

            AnimatorSet.Builder b = anim.play(ObjectAnimator.ofFloat(mTopVisibilityView, "alpha", 1));

            b.with(ObjectAnimator.ofFloat(mTopVisibilityView, "translationY", 0));

            if (mContentView != null) {

                b.with(ObjectAnimator.ofFloat(mContentView, "translationY",

                        -mTopVisibilityView.getHeight(), 0));

                mTopVisibilityView.setTranslationY(-mTopVisibilityView.getHeight());

                b.with(ObjectAnimator.ofFloat(mTopVisibilityView, "translationY", 0));

            }

            if (mSplitView != null && mContextDisplayMode == CONTEXT_DISPLAY_SPLIT) {

                mSplitView.setAlpha(0);

                mSplitView.setTranslationY(mSplitView.getHeight());

                mSplitView.setVisibility(View.VISIBLE);

                b.with(ObjectAnimator.ofFloat(mSplitView, "alpha", 1));

                b.with(ObjectAnimator.ofFloat(mSplitView, "translationY", 0));

            }

            anim.setInterpolator(AnimationUtils.loadInterpolator(mContext,

                    com.android.internal.R.interpolator.decelerate_quad));

            anim.addListener(mShowListener);

            mCurrentShowAnim = anim;

            anim.start();
@@ -638,16 +643,20 @@ public class ActionBarImpl extends ActionBar { 
            mContainerView.setTransitioning(true);

            AnimatorSet anim = new AnimatorSet();

            AnimatorSet.Builder b = anim.play(ObjectAnimator.ofFloat(mTopVisibilityView, "alpha", 0));

            b.with(ObjectAnimator.ofFloat(mTopVisibilityView, "translationY",

                    -mTopVisibilityView.getHeight()));

            if (mContentView != null) {

                b.with(ObjectAnimator.ofFloat(mContentView, "translationY",

                        0, -mTopVisibilityView.getHeight()));

                b.with(ObjectAnimator.ofFloat(mTopVisibilityView, "translationY",

                        -mTopVisibilityView.getHeight()));

            }

            if (mSplitView != null && mSplitView.getVisibility() == View.VISIBLE) {

                mSplitView.setAlpha(1);

                b.with(ObjectAnimator.ofFloat(mSplitView, "alpha", 0));

                b.with(ObjectAnimator.ofFloat(mSplitView, "translationY",

                        mSplitView.getHeight()));

            }

            anim.setInterpolator(AnimationUtils.loadInterpolator(mContext,

                    com.android.internal.R.interpolator.accelerate_quad));

            anim.addListener(mHideListener);

            mCurrentShowAnim = anim;

            anim.start();

core/res/res/anim/dock_bottom_enter.xml

+1 −3
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
<!-- Animation for when a dock window at the bottom of the screen is entering. -->

<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:interpolator="@android:interpolator/decelerate_quad">

    <translate android:fromYDelta="75%" android:toYDelta="0"

        android:duration="@android:integer/config_mediumAnimTime"/>

    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

    <translate android:fromYDelta="100%" android:toYDelta="0"

        android:duration="@android:integer/config_mediumAnimTime"/>

</set>

core/res/res/anim/dock_bottom_exit.xml

+1 −3
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
<!-- Animation for when a dock window at the bottom of the screen is exiting. -->

<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:interpolator="@android:interpolator/accelerate_quad">

    <translate android:fromYDelta="0" android:toYDelta="75%"

        android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/>

    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"

    <translate android:fromYDelta="0" android:toYDelta="100%"

        android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/>

</set>

core/res/res/anim/dock_left_enter.xml

+1 −3
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
<!-- Animation for when a dock window at the left of the screen is entering. -->

<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:interpolator="@android:interpolator/decelerate_quad">

    <translate android:fromXDelta="-75%" android:toXDelta="0"

        android:duration="@android:integer/config_mediumAnimTime"/>

    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"

    <translate android:fromXDelta="-100%" android:toXDelta="0"

        android:duration="@android:integer/config_mediumAnimTime"/>

</set>

core/res/res/anim/dock_left_exit.xml

+1 −3
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
<!-- Animation for when a dock window at the right of the screen is exiting. -->

<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:interpolator="@android:interpolator/accelerate_quad">

    <translate android:fromXDelta="0" android:toXDelta="-75%"

        android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/>

    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"

    <translate android:fromXDelta="0" android:toXDelta="-100%"

        android:startOffset="100" android:duration="@android:integer/config_mediumAnimTime"/>

</set>