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 am: 9cf7941324

Browse Source 
Change-Id: Iaf7e3cc9acef95cda544440c7d99ea4ff3e08e02
This commit is contained in:
TreeHugger Robot
2020-05-28 14:25:16 +00:00
committed by Automerger Merge Worker
parent 26a62c0df6 9cf7941324
commit 790e618c22
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
|| 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;
}