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

Commit c2d41154 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "View: Expose gatherTransparentRegion" into sc-dev

parents 2a8031d8 354c5659

core/api/current.txt

+1 −2
Original line number Diff line number Diff line
@@ -48360,7 +48360,6 @@ package android.view { 
    ctor public SurfaceView(android.content.Context, android.util.AttributeSet);

    ctor public SurfaceView(android.content.Context, android.util.AttributeSet, int);

    ctor public SurfaceView(android.content.Context, android.util.AttributeSet, int, int);

    method public boolean gatherTransparentRegion(android.graphics.Region);

    method public android.view.SurfaceHolder getHolder();

    method @Nullable public android.os.IBinder getHostToken();

    method public android.view.SurfaceControl getSurfaceControl();
@@ -48562,6 +48561,7 @@ package android.view { 
    method public android.view.View focusSearch(int);

    method public void forceHasOverlappingRendering(boolean);

    method public void forceLayout();

    method public boolean gatherTransparentRegion(@Nullable android.graphics.Region);

    method public void generateDisplayHash(@NonNull String, @Nullable android.graphics.Rect, @NonNull java.util.concurrent.Executor, @NonNull android.view.displayhash.DisplayHashResultCallback);

    method public static int generateViewId();

    method public CharSequence getAccessibilityClassName();
@@ -49543,7 +49543,6 @@ package android.view { 
    method public void endViewTransition(android.view.View);

    method public android.view.View focusSearch(android.view.View, int);

    method public void focusableViewAvailable(android.view.View);

    method public boolean gatherTransparentRegion(android.graphics.Region);

    method protected android.view.ViewGroup.LayoutParams generateDefaultLayoutParams();

    method public android.view.ViewGroup.LayoutParams generateLayoutParams(android.util.AttributeSet);

    method protected android.view.ViewGroup.LayoutParams generateLayoutParams(android.view.ViewGroup.LayoutParams);

core/java/android/view/View.java

+2 −4
Original line number Diff line number Diff line
@@ -26119,7 +26119,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    }















    /**













     * This is used by the RootView to perform an optimization when













     * This is used by the ViewRoot to perform an optimization when















     * the view hierarchy contains one or several SurfaceView.















     * SurfaceView is always considered transparent, but its children are not,















     * therefore all View objects remove themselves from the global transparent









@@ -26131,10 +26131,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













     * point is opaque, regardless of the transparent region; returns false















     * if it is possible for underlying windows to be seen behind the view.















     *













     * {@hide}















     */













    @UnsupportedAppUsage













    public boolean gatherTransparentRegion(Region region) {













    public boolean gatherTransparentRegion(@Nullable Region region) {















        final AttachInfo attachInfo = mAttachInfo;















        if (region != null && attachInfo != null) {















            final int pflags = mPrivateFlags;