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

Commit 845d9192 authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "Enable transitions in lockscreen media controller" into klp-dev

parents 4c76fdd8 aa006133

core/java/android/transition/ChangeText.java

+5 −2
Original line number Diff line number Diff line
@@ -179,8 +179,8 @@ public class ChangeText extends Transition { 
            startSelectionStart = startSelectionEnd = endSelectionStart = endSelectionEnd = -1;

        }

        if (!startText.equals(endText)) {

            final int startColor = (Integer) startVals.get(PROPNAME_TEXT_COLOR);

            final int endColor = (Integer) endVals.get(PROPNAME_TEXT_COLOR);

            final int startColor;

            final int endColor;

            if (mChangeBehavior != CHANGE_BEHAVIOR_IN) {

                view.setText(startText);

                if (view instanceof EditText) {
@@ -189,6 +189,7 @@ public class ChangeText extends Transition { 
            }

            Animator anim;

            if (mChangeBehavior == CHANGE_BEHAVIOR_KEEP) {

                startColor = endColor = 0;

                anim = ValueAnimator.ofFloat(0, 1);

                anim.addListener(new AnimatorListenerAdapter() {

                    @Override
@@ -203,6 +204,8 @@ public class ChangeText extends Transition { 
                    }

                });

            } else {

                startColor = (Integer) startVals.get(PROPNAME_TEXT_COLOR);

                endColor = (Integer) endVals.get(PROPNAME_TEXT_COLOR);

                // Fade out start text

                ValueAnimator outAnim = null, inAnim = null;

                if (mChangeBehavior == CHANGE_BEHAVIOR_OUT_IN ||

core/java/android/transition/TransitionManager.java

+1 −6
Original line number Diff line number Diff line
@@ -240,12 +240,7 @@ public class TransitionManager { 
                    }

                    transition.playTransition(sceneRoot);



                    // Returning false from onPreDraw() skips the current frame. This is

                    // necessary to avoid artifacts caused by resetting target views

                    // to their proper end states for capturing. Waiting until the next

                    // frame to draw allows these views to have their mid-transition

                    // values set on them again and avoid artifacts.

                    return false;

                    return true;

                }

            };

            observer.addOnPreDrawListener(listener);

packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class KeyguardTransportControlView extends FrameLayout { 
    protected static final boolean DEBUG = false;

    protected static final String TAG = "TransportControlView";



    private static final boolean ANIMATE_TRANSITIONS = false;

    private static final boolean ANIMATE_TRANSITIONS = true;



    private ViewGroup mMetadataContainer;

    private ViewGroup mInfoContainer;