Merge "Revert "Remove @hide from ViewGroup debug methods"" (98517be3) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −3

Original line number	Diff line number	Diff line
		@@ -48146,8 +48146,6 @@ package android.view {
		method public void notifySubtreeAccessibilityStateChanged(android.view.View, android.view.View, int);
		method public final void offsetDescendantRectToMyCoords(android.view.View, android.graphics.Rect);
		method public final void offsetRectIntoDescendantCoords(android.view.View, android.graphics.Rect);
		method protected void onDebugDraw(android.graphics.Canvas);
		method protected void onDebugDrawMargins(android.graphics.Canvas, android.graphics.Paint);
		method public boolean onInterceptHoverEvent(android.view.MotionEvent);
		method public boolean onInterceptTouchEvent(android.view.MotionEvent);
		method protected abstract void onLayout(boolean, int, int, int, int);
		@@ -48221,7 +48219,6 @@ package android.view {
		ctor public ViewGroup.LayoutParams(android.content.Context, android.util.AttributeSet);
		ctor public ViewGroup.LayoutParams(int, int);
		ctor public ViewGroup.LayoutParams(android.view.ViewGroup.LayoutParams);
		method public void onDebugDraw(android.view.View, android.graphics.Canvas, android.graphics.Paint);
		method public void resolveLayoutDirection(int);
		method protected void setBaseAttributes(android.content.res.TypedArray, int, int);
		field public static final deprecated int FILL_PARENT = -1; // 0xffffffff

core/java/android/view/ViewGroup.java

+7 −28

Original line number	Diff line number	Diff line
		@@ -3971,15 +3971,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		}

		/**
		* Layout debugging code which draws rectangles around layout params.
		*
		* <p>This function is called automatically when the developer setting is enabled.<p/>
		*
		* <p>It is strongly advised to only call this function from debug builds as there is
		* a risk of leaking unwanted layout information.<p/>
		*
		* @param canvas the canvas on which to draw
		* @param paint the paint used to draw through
		* @hide
		*/
		protected void onDebugDrawMargins(Canvas canvas, Paint paint) {
		for (int i = 0; i < getChildCount(); i++) {
		@@ -3989,19 +3981,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		}

		/**
		* Layout debugging code which draws rectangles around:
		* <ul>
		* <li>optical bounds<li/>
		* <li>margins<li/>
		* <li>clip bounds<li/>
		* <ul/>
		*
		* <p>This function is called automatically when the developer setting is enabled.<p/>
		*
		* <p>It is strongly advised to only call this function from debug builds as there is
		* a risk of leaking unwanted layout information.<p/>
		*
		* @param canvas the canvas on which to draw
		* @hide
		*/
		protected void onDebugDraw(Canvas canvas) {
		Paint paint = getDebugPaint();
		@@ -7732,14 +7712,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		/**
		* Use {@code canvas} to draw suitable debugging annotations for these LayoutParameters.
		*
		* <p>This function is called automatically when the developer setting is enabled.<p/>
		*
		* <p>It is strongly advised to only call this function from debug builds as there is
		* a risk of leaking unwanted layout information.<p/>
		*
		* @param view the view that contains these layout parameters
		* @param canvas the canvas on which to draw
		* @param paint the paint used to draw through
		*
		* @hide
		*/
		public void onDebugDraw(View view, Canvas canvas, Paint paint) {
		}
		@@ -8243,6 +8219,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		return ((mMarginFlags & LAYOUT_DIRECTION_MASK) == View.LAYOUT_DIRECTION_RTL);
		}

		/**
		* @hide
		*/
		@Override
		public void onDebugDraw(View view, Canvas canvas, Paint paint) {
		Insets oi = isLayoutModeOptical(view.mParent) ? view.getOpticalInsets() : Insets.NONE;

core/java/android/widget/GridLayout.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -904,6 +904,9 @@ public class GridLayout extends ViewGroup {
		}
		}

		/**
		* @hide
		*/
		@Override
		protected void onDebugDrawMargins(Canvas canvas, Paint paint) {
		// Apply defaults, so as to remove UNDEFINED values
		@@ -919,6 +922,9 @@ public class GridLayout extends ViewGroup {
		}
		}

		/**
		* @hide
		*/
		@Override
		protected void onDebugDraw(Canvas canvas) {
		Paint paint = new Paint();