From eefd5256416ea0e5ca458b4f94575be9af55b236 Mon Sep 17 00:00:00 2001 From: Andrey Kulikov Date: Wed, 28 Nov 2018 12:42:01 +0000 Subject: Made ViewGroup.suppressLayout/isLayoutSuppressed public It will allows the usage of this methods in AndroidX Transitions without reflection. Bug: 117520180 Test: new cts tests for the methods added Change-Id: Idf26d4b5c9fd2bb975e5a86dd46bd631c326b861 --- api/current.txt | 2 ++ core/java/android/view/ViewGroup.java | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/api/current.txt b/api/current.txt index 44cc6786be51..3e7425582f15 100644 --- a/api/current.txt +++ b/api/current.txt @@ -49788,6 +49788,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); @@ -49853,6 +49854,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; -- cgit v1.2.3-59-g8ed1b