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

Commit 54f4ba8d authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "Reset the alpha for offscreen views." into lmp-dev

parents f116056a 653ea66a

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