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

Merge "Hide children in ViewGroup.createSnaphost via internal flag and add test for it." into nyc-dev

Browse Source 
am: 394d3df

* commit '394d3dfb2d9ccd2ca2fd7aad06ef2e9a8458a0c7':
  Hide children in ViewGroup.createSnaphost via internal flag and add test for it.

Change-Id: Iab1265b6a4c4ff5291259f7e5d9b96c217ee3141
This commit is contained in:
sergeyv
2016-03-31 00:32:41 +00:00
committed by android-build-merger
parent 617608769d 394d3dfb2d
commit 761f59c19f
8 changed files with 185 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16299,8 +16299,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
/**
* Create a snapshot of the view into a bitmap. We should probably make
* some form of this public, but should think about the API.
*
* @hide
*/
Bitmap createSnapshot(Bitmap.Config quality, int backgroundColor, boolean skipChildren) {
public Bitmap createSnapshot(Bitmap.Config quality, int backgroundColor, boolean skipChildren) {
int width = mRight - mLeft;
int height = mBottom - mTop;

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

@@ -3251,8 +3251,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
}
}
/**
* @hide
*/
@Override
Bitmap createSnapshot(Bitmap.Config quality, int backgroundColor, boolean skipChildren) {
public Bitmap createSnapshot(Bitmap.Config quality, int backgroundColor, boolean skipChildren) {
int count = mChildrenCount;
int[] visibilities = null;
@@ -3262,7 +3265,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
View child = getChildAt(i);
visibilities[i] = child.getVisibility();
if (visibilities[i] == View.VISIBLE) {
child.setVisibility(INVISIBLE);
child.mViewFlags = (child.mViewFlags & ~View.VISIBILITY_MASK)
| (View.INVISIBLE & View.VISIBILITY_MASK);
}
}
}
@@ -3271,7 +3275,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
if (skipChildren) {
for (int i = 0; i < count; i++) {
getChildAt(i).setVisibility(visibilities[i]);
View child = getChildAt(i);
child.mViewFlags = (child.mViewFlags & ~View.VISIBILITY_MASK)
| (visibilities[i] & View.VISIBILITY_MASK);
}
}