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

Commit 0bdf1caf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Insets: Allow animations when setting SYSTEM_UI_LAYOUT_* flags" into rvc-dev am: 9cf79413 

Change-Id: Ibe4c3300faa1989aa8b8f2464a4d6870317db549
parents 3c318c94 9cf79413

core/java/android/view/ViewGroup.java

+4 −2
Original line number Diff line number Diff line
@@ -7298,7 +7298,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        boolean isOptionalFitSystemWindows = (mViewFlags & OPTIONAL_FITS_SYSTEM_WINDOWS) != 0

                || isFrameworkOptionalFitsSystemWindows();

        if (isOptionalFitSystemWindows && mAttachInfo != null

                && mAttachInfo.mContentOnApplyWindowInsetsListener != null) {

                && mAttachInfo.mContentOnApplyWindowInsetsListener != null

                && (getWindowSystemUiVisibility() & SYSTEM_UI_LAYOUT_FLAGS) == 0) {

            return false;

        }
@@ -7322,7 +7323,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
                || isFrameworkOptionalFitsSystemWindows();

        if (isOptionalFitSystemWindows && mAttachInfo != null

                && getListenerInfo().mWindowInsetsAnimationCallback == null

                && mAttachInfo.mContentOnApplyWindowInsetsListener != null) {

                && mAttachInfo.mContentOnApplyWindowInsetsListener != null

                && (getWindowSystemUiVisibility() & SYSTEM_UI_LAYOUT_FLAGS) == 0) {

            mInsetsAnimationDispatchMode = DISPATCH_MODE_STOP;

            return;

        }