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

Merge "Implement alternative ViewGroup.getChildVisibleRect." into nyc-dev

Browse Source
This commit is contained in:
Abodunrinwa Toki
2016-05-03 20:13:24 +00:00
committed by Android (Google) Code Review
parent facdf19313 4e7a1208ea
commit f62dd564ed
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/view/ViewGroup.java
View File

@@ -5473,6 +5473,14 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
@Override @Override
public boolean getChildVisibleRect(View child, Rect r, android.graphics.Point offset) { public boolean getChildVisibleRect(View child, Rect r, android.graphics.Point offset) {
return getChildVisibleRect(child, r, offset, false);
}
/**
* @hide
*/
public boolean getChildVisibleRect(
View child, Rect r, android.graphics.Point offset, boolean forceParentCheck) {
// It doesn't make a whole lot of sense to call this on a view that isn't attached, // It doesn't make a whole lot of sense to call this on a view that isn't attached,
// but for some simple tests it can be useful. If we don't have attach info this // but for some simple tests it can be useful. If we don't have attach info this
// will allocate memory. // will allocate memory.
@@ -5512,20 +5520,22 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
rectIsVisible = rect.intersect(0, 0, width, height); rectIsVisible = rect.intersect(0, 0, width, height);
} }
if (rectIsVisible && (mGroupFlags & CLIP_TO_PADDING_MASK) == CLIP_TO_PADDING_MASK) { if ((forceParentCheck || rectIsVisible)
&& (mGroupFlags & CLIP_TO_PADDING_MASK) == CLIP_TO_PADDING_MASK) {
// Clip to padding. // Clip to padding.
rectIsVisible = rect.intersect(mPaddingLeft, mPaddingTop, rectIsVisible = rect.intersect(mPaddingLeft, mPaddingTop,
width - mPaddingRight, height - mPaddingBottom); width - mPaddingRight, height - mPaddingBottom);
} }
if (rectIsVisible && mClipBounds != null) { if ((forceParentCheck || rectIsVisible) && mClipBounds != null) {
// Clip to clipBounds. // Clip to clipBounds.
rectIsVisible = rect.intersect(mClipBounds.left, mClipBounds.top, mClipBounds.right, rectIsVisible = rect.intersect(mClipBounds.left, mClipBounds.top, mClipBounds.right,
mClipBounds.bottom); mClipBounds.bottom);
} }
r.set((int) Math.floor(rect.left), (int) Math.floor(rect.top), r.set((int) Math.floor(rect.left), (int) Math.floor(rect.top),
(int) Math.ceil(rect.right), (int) Math.ceil(rect.bottom)); (int) Math.ceil(rect.right), (int) Math.ceil(rect.bottom));
if (rectIsVisible && mParent != null) {
if ((forceParentCheck || rectIsVisible) && mParent != null) {
rectIsVisible = mParent.getChildVisibleRect(this, r, offset); rectIsVisible = mParent.getChildVisibleRect(this, r, offset);
} }
return rectIsVisible; return rectIsVisible;

3
core/java/com/android/internal/view/FloatingActionMode.java
View File

@@ -173,7 +173,8 @@ public class FloatingActionMode extends ActionMode {
final ViewParent parent = mOriginatingView.getParent(); final ViewParent parent = mOriginatingView.getParent();
if (parent instanceof ViewGroup) { if (parent instanceof ViewGroup) {
((ViewGroup) parent).getChildVisibleRect( ((ViewGroup) parent).getChildVisibleRect(
mOriginatingView, mContentRectOnScreen, null /* offset */); mOriginatingView, mContentRectOnScreen,
null /* offset */, true /* forceParentCheck */);
mContentRectOnScreen.offset(mRootViewPositionOnScreen[0], mRootViewPositionOnScreen[1]); mContentRectOnScreen.offset(mRootViewPositionOnScreen[0], mRootViewPositionOnScreen[1]);
} else { } else {
mContentRectOnScreen.offset(mViewPositionOnScreen[0], mViewPositionOnScreen[1]); mContentRectOnScreen.offset(mViewPositionOnScreen[0], mViewPositionOnScreen[1]);