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

Commit c18bcee3 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by android-build-merger
Browse files

Merge "Temporarily allow StackView to use a canvas.clipRectUnion" into pi-dev am: 7a7b2369 

am: 8f0335fd

Change-Id: Id22c0ad948b9aecfc0844ab0ad9b0d9eb376febb
parents d2b4be09 8f0335fd

core/java/android/widget/StackView.java

+2 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.graphics.PorterDuff; 
import android.graphics.PorterDuffXfermode;

import android.graphics.Rect;

import android.graphics.RectF;

import android.graphics.Region;

import android.graphics.TableMaskFilter;

import android.os.Bundle;

import android.util.AttributeSet;
@@ -550,8 +549,8 @@ public class StackView extends AdapterViewAnimator { 


        // We only expand the clip bounds if necessary.

        if (expandClipRegion) {

            canvas.save(Canvas.CLIP_SAVE_FLAG);

            canvas.clipRect(stackInvalidateRect, Region.Op.UNION);

            canvas.save();

            canvas.clipRectUnion(stackInvalidateRect);

            super.dispatchDraw(canvas);

            canvas.restore();

        } else {

graphics/java/android/graphics/Canvas.java

+11 −0
Original line number Diff line number Diff line
@@ -828,6 +828,17 @@ public class Canvas extends BaseCanvas { 
                op.nativeInt);

    }



    /**

     * DON'T USE THIS METHOD.  It exists only to support a particular legacy behavior in

     * the view system and will be removed as soon as that code is refactored to no longer

     * depend on this behavior.

     * @hide

     */

    public boolean clipRectUnion(@NonNull Rect rect) {

        return nClipRect(mNativeCanvasWrapper, rect.left, rect.top, rect.right, rect.bottom,

                Region.Op.UNION.nativeInt);

    }



    /**

     * Intersect the current clip with the specified rectangle, which is

     * expressed in local coordinates.