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

Commit ffc9c740 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "The transformhelper now also transforms gone views"

parents 8b39573f 00708abf

packages/SystemUI/src/com/android/systemui/statusbar/ViewTransformationHelper.java

+0 −3
Original line number Diff line number Diff line
@@ -224,9 +224,6 @@ public class ViewTransformationHelper implements TransformableView { 
        stack.push(viewRoot);

        while (!stack.isEmpty()) {

            View child = stack.pop();

            if (child.getVisibility() == View.GONE) {

                continue;

            }

            Boolean containsView = (Boolean) child.getTag(TAG_CONTAINS_TRANSFORMED_VIEW);

            if (containsView == null) {

                // This one is unhandled, let's add it to our list.

packages/SystemUI/src/com/android/systemui/statusbar/notification/TransformState.java

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ public class TransformState { 
    public void transformViewFrom(TransformState otherState, float transformationAmount) {

        mTransformedView.animate().cancel();

        if (sameAs(otherState)) {

            if (mTransformedView.getVisibility() == View.INVISIBLE) {

            if (mTransformedView.getVisibility() == View.INVISIBLE

                    || mTransformedView.getAlpha() != 1.0f) {

                // We have the same content, lets show ourselves

                mTransformedView.setAlpha(1.0f);

                mTransformedView.setVisibility(View.VISIBLE);