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

Commit e4a2d7c4 authored by Chet Haase's avatar Chet Haase
Browse files

Fix ViewGroupOverlay's handling of invalidating viewgroups 

Invalidating a view property (alpha, rotation, etc.) causes an
invalidation process that does not work correctly when the view is
in a ViewOverlay. Specifically, if the view is not directly in the
overlay, but is instead inside a hierarchy which is within the overlay,
then the invalidation process stops at the ViewOverlay itself, because
the ViewOverlay has no "parent" view.

The fix is to override the invalidateChildInParentFast() method, just
like we override invalidateChildInParent(), to forward the invalidation
to the host view.

Issue #9389230 Animations not running for nested views under ViewGroupOverlay

Change-Id: I03fcef10ed1c8a91cb26d5d9d6945634b0b695b5
parent 00c5620a

core/java/android/view/ViewGroup.java

+3 −1
Original line number Diff line number Diff line
@@ -4426,8 +4426,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
    /**

     * Quick invalidation method that simply transforms the dirty rect into the parent's

     * coordinate system, pruning the invalidation if the parent has already been invalidated.

     *

     * @hide

     */

    private ViewParent invalidateChildInParentFast(int left, int top, final Rect dirty) {

    protected ViewParent invalidateChildInParentFast(int left, int top, final Rect dirty) {

        if ((mPrivateFlags & PFLAG_DRAWN) == PFLAG_DRAWN ||

                (mPrivateFlags & PFLAG_DRAWING_CACHE_VALID) == PFLAG_DRAWING_CACHE_VALID) {

            dirty.offset(left - mScrollX, top - mScrollY);

core/java/android/view/ViewOverlay.java

+11 −0
Original line number Diff line number Diff line
@@ -300,6 +300,17 @@ public class ViewOverlay { 
            }

        }



        /**

         * @hide

         */

        @Override

        protected ViewParent invalidateChildInParentFast(int left, int top, Rect dirty) {

            if (mHostView instanceof ViewGroup) {

                return ((ViewGroup) mHostView).invalidateChildInParentFast(left, top, dirty);

            }

            return null;

        }



        @Override

        public ViewParent invalidateChildInParent(int[] location, Rect dirty) {

            if (mHostView != null) {