Merge "Made ViewGroup.suppressLayout/isLayoutSuppressed public"

2 files changed, 2 insertions, 5 deletions

diff --git a/api/current.txt b/api/current.txt
index 855ac8c16ae2..8885f35d64b7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -49870,6 +49870,7 @@ package android.view {
     method public deprecated boolean isAnimationCacheEnabled();
     method protected boolean isChildrenDrawingOrderEnabled();
     method protected deprecated boolean isChildrenDrawnWithCacheEnabled();
+    method public boolean isLayoutSuppressed();
     method public boolean isMotionEventSplittingEnabled();
     method public boolean isTransitionGroup();
     method public final void layout(int, int, int, int);
@@ -49935,6 +49936,7 @@ package android.view {
     method public android.view.ActionMode startActionModeForChild(android.view.View, android.view.ActionMode.Callback, int);
     method public void startLayoutAnimation();
     method public void startViewTransition(android.view.View);
+    method public void suppressLayout(boolean);
     method public void updateViewLayout(android.view.View, android.view.ViewGroup.LayoutParams);
     field protected static final int CLIP_TO_PADDING_MASK = 34; // 0x22
     field public static final int FOCUS_AFTER_DESCENDANTS = 262144; // 0x40000
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 1e91aa87bfb7..741510e67130 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -7042,10 +7042,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
      * suppression is disabled with a later call to suppressLayout(false).
      * When layout suppression is disabled, a requestLayout() call is sent
      * if layout() was attempted while layout was being suppressed.
-     *
-     * @hide
      */
-    @UnsupportedAppUsage
     public void suppressLayout(boolean suppress) {
         mSuppressLayout = suppress;
         if (!suppress) {
@@ -7061,8 +7058,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
      * suppressed, due to an earlier call to {@link #suppressLayout(boolean)}.
      *
      * @return true if layout calls are currently suppressed, false otherwise.
-     *
-     * @hide
      */
     public boolean isLayoutSuppressed() {
         return mSuppressLayout;