Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-28 14:14:15 +00:00
committed by Android (Google) Code Review
parent c119ee1ed2 2e2631572a
commit 9cf7941324
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/ViewGroup.java
View File

@@ -7298,7 +7298,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
boolean isOptionalFitSystemWindows = (mViewFlags & OPTIONAL_FITS_SYSTEM_WINDOWS) != 0 boolean isOptionalFitSystemWindows = (mViewFlags & OPTIONAL_FITS_SYSTEM_WINDOWS) != 0
|| isFrameworkOptionalFitsSystemWindows(); || isFrameworkOptionalFitsSystemWindows();
if (isOptionalFitSystemWindows && mAttachInfo != null if (isOptionalFitSystemWindows && mAttachInfo != null
&& mAttachInfo.mContentOnApplyWindowInsetsListener != null) { && mAttachInfo.mContentOnApplyWindowInsetsListener != null
&& (getWindowSystemUiVisibility() & SYSTEM_UI_LAYOUT_FLAGS) == 0) {
return false; return false;
} }
@@ -7322,7 +7323,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
|| isFrameworkOptionalFitsSystemWindows(); || isFrameworkOptionalFitsSystemWindows();
if (isOptionalFitSystemWindows && mAttachInfo != null if (isOptionalFitSystemWindows && mAttachInfo != null
&& getListenerInfo().mWindowInsetsAnimationCallback == null && getListenerInfo().mWindowInsetsAnimationCallback == null
&& mAttachInfo.mContentOnApplyWindowInsetsListener != null) { && mAttachInfo.mContentOnApplyWindowInsetsListener != null
&& (getWindowSystemUiVisibility() & SYSTEM_UI_LAYOUT_FLAGS) == 0) {
mInsetsAnimationDispatchMode = DISPATCH_MODE_STOP; mInsetsAnimationDispatchMode = DISPATCH_MODE_STOP;
return; return;
} }