Merge "Only request layout when removeView() actually removes a view" into lmp-mr1-dev (e28cd1a2) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewGroup.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -4078,10 +4078,11 @@ 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);
		if (removeViewInternal(view)) {
		requestLayout();
		invalidate(true);
		}
		}

		/**
		* Removes a view during layout. This is useful if in your onLayout() method,
		@@ -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) {