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

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

Fix gmail crossfade artifacts. 

Display lists could not handle custom views that did their
own draw dispatching, as is the case with gmail. This fix makes that
possible and display lists handle this case robustly. Now the
crossfade works because the display lists contain the right content.

Change-Id: Iea7d6e99239b24f833701d546fe083aa00e2b31b
parent da910fd5

core/java/android/view/ViewGroup.java

+8 −11
Original line number Diff line number Diff line
@@ -2264,12 +2264,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        boolean caching;

        int layerType = child.getLayerType();



        final boolean hardwareAccelerated = canvas.isHardwareAccelerated();

        if ((flags & FLAG_CHILDREN_DRAWN_WITH_CACHE) == FLAG_CHILDREN_DRAWN_WITH_CACHE ||

                (flags & FLAG_ALWAYS_DRAWN_WITH_CACHE) == FLAG_ALWAYS_DRAWN_WITH_CACHE) {

            caching = true;

            if (mAttachInfo != null) scalingRequired = mAttachInfo.mScalingRequired;

        } else {

            caching = (layerType != LAYER_TYPE_NONE) || canvas.isHardwareAccelerated();

            caching = (layerType != LAYER_TYPE_NONE) || hardwareAccelerated;

        }



        if (a != null) {
@@ -2351,7 +2352,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
            return more;

        }



        if (canvas.isHardwareAccelerated()) {

        if (hardwareAccelerated) {

            // Clear INVALIDATED flag to allow invalidation to occur during rendering, but

            // retain the flag's value temporarily in the mRecreateDisplayList flag

            child.mRecreateDisplayList = (child.mPrivateFlags & INVALIDATED) == INVALIDATED;
@@ -2367,7 +2368,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        Bitmap cache = null;

        boolean hasDisplayList = false;

        if (caching) {

            if (!canvas.isHardwareAccelerated()) {

            if (!hardwareAccelerated) {

                if (layerType != LAYER_TYPE_NONE) {

                    layerType = LAYER_TYPE_SOFTWARE;

                    child.buildDrawingCache(true);
@@ -2506,13 +2507,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
                    }

                } else {

                    child.mPrivateFlags &= ~DIRTY_MASK;

                    // Skip drawing the display list into ours if we were just refreshing

                    // it's content; we already have a reference to it in our display list

                    if (mRecreateDisplayList || mLayerType != LAYER_TYPE_NONE) {

                    ((HardwareCanvas) canvas).drawDisplayList(displayList);

                }

            }

            }

        } else if (cache != null) {

            child.mPrivateFlags &= ~DIRTY_MASK;

            Paint cachePaint;
@@ -2536,13 +2533,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        canvas.restoreToCount(restoreTo);



        if (a != null && !more) {

            if (!canvas.isHardwareAccelerated() && !a.getFillAfter()) {

            if (!hardwareAccelerated && !a.getFillAfter()) {

                child.onSetAlpha(255);

            }

            finishAnimatingView(child, a);

        }



        if (more && canvas.isHardwareAccelerated()) {

        if (more && hardwareAccelerated) {

            // invalidation is the trigger to recreate display lists, so if we're using

            // display lists to render, force an invalidate to allow the animation to

            // continue drawing another frame