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

Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-10-20 19:00:35 +00:00
committed by Android (Google) Code Review
parent 846b71daaf 177ec4608e
commit e28cd1a276
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4078,9 +4078,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
* {@link #dispatchDraw(android.graphics.Canvas)} or any related method.</p>
*/
public void removeView(View view) {
removeViewInternal(view);
requestLayout();
invalidate(true);
if (removeViewInternal(view)) {
requestLayout();
invalidate(true);
}
}
/**
@@ -4143,11 +4144,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
invalidate(true);
}
private void removeViewInternal(View view) {
private boolean removeViewInternal(View view) {
final int index = indexOfChild(view);
if (index >= 0) {
removeViewInternal(index, view);
return true;
}
return false;
}
private void removeViewInternal(int index, View view) {