Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bcd414e authored by Andrey Kulikov's avatar Andrey Kulikov Committed by Android (Google) Code Review
Browse files

Merge "Made ViewGroup.suppressLayout/isLayoutSuppressed public"

parents 0d77844e eefd5256

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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

core/java/android/view/ViewGroup.java

+0 −5
Original line number Diff line number Diff line
@@ -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;