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

Commit d8d25054 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... 

Merge "Insets: Allow animations when setting SYSTEM_UI_LAYOUT_* flags" into rvc-dev am: 9cf79413 am: 790e618c am: 347da37a am: 3e0312f4

Change-Id: Id68d7aed6c7b6051a879daa5700935322823509b
parents 5e9aa288 3e0312f4

core/java/android/view/ViewGroup.java

+4 −2
Original line number Diff line number Diff line
@@ -7296,7 +7296,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;

        }
@@ -7320,7 +7321,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;

        }