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

Commit b65f0d5f authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix setLayerType"

parents 5b2034e2 ca0608af

core/java/android/view/View.java

+4 −9
Original line number Diff line number Diff line
@@ -13432,8 +13432,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        // Destroy any previous software drawing cache if needed

        if (mLayerType == LAYER_TYPE_SOFTWARE) {

            destroyDrawingCache();

            invalidateParentCaches();

            invalidate(true);

        }















        mLayerType = layerType;









@@ -13441,13 +13439,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













        mLayerPaint = layerDisabled ? null : (paint == null ? new Paint() : paint);















        mRenderNode.setLayerPaint(mLayerPaint);



























        if (mLayerType == LAYER_TYPE_SOFTWARE) {













            // LAYER_TYPE_SOFTWARE is handled by View:draw(), so need to invalidate()













        // draw() behaves differently if we are on a layer, so we need to













        // invalidate() here















        invalidateParentCaches();















        invalidate(true);













        } else {













            invalidateViewProperty(false, false);













        }















    }





























    /**