Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "View: Expose gatherTransparentRegion" into sc-dev

Browse Source
This commit is contained in:
Rob Carr
2021-04-21 22:18:11 +00:00
committed by Android (Google) Code Review
parent 2a8031d889 354c56590e
commit c2d41154f0
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/api/current.txt
View File

@@ -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);

6
core/java/android/view/View.java
View File

@@ -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;