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

Commit 653ea66a authored by George Mount's avatar George Mount
Browse files

Reset the alpha for offscreen views. 

Bug 17469303

When stripping the offscreen views from a transition, the alpha
wasn't reset, so they were made permanently invisible.

Change-Id: I2e87fff1d3b1e417997cabf9c703143355fe2c01
parent 04c9d29b

core/java/android/app/ActivityTransitionCoordinator.java

+12 −8
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
            View view = mTransitioningViews.get(i);

            if (!view.getGlobalVisibleRect(r)) {

                mTransitioningViews.remove(i);

                showView(view, true);

            }

        }

    }
@@ -605,7 +606,11 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
    protected void showViews(ArrayList<View> views, boolean setTransitionAlpha) {

        int count = views.size();

        for (int i = 0; i < count; i++) {

            View view = views.get(i);

            showView(views.get(i), setTransitionAlpha);

        }

    }



    private void showView(View view, boolean setTransitionAlpha) {

        Float alpha = mOriginalAlphas.remove(view);

        if (alpha != null) {

            view.setAlpha(alpha);
@@ -614,7 +619,6 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
            view.setTransitionAlpha(1f);

        }

    }

    }



    /**

     * Captures placement information for Views with a shared element name for