Merge "Check mAttachInfo.mSystemUiVisibility to see if a SysUI flag exists" into tm-dev

This commit is contained in:
Tiger Huang
2022-03-25 10:30:49 +00:00
committed by Android (Google) Code Review

View File

@@ -2338,10 +2338,9 @@ public final class ViewRootImpl implements ViewParent,
final int systemUiFlag = publicType == Type.statusBars() final int systemUiFlag = publicType == Type.statusBars()
? View.SYSTEM_UI_FLAG_FULLSCREEN ? View.SYSTEM_UI_FLAG_FULLSCREEN
: View.SYSTEM_UI_FLAG_HIDE_NAVIGATION; : View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
final boolean wasVisible = (info.globalVisibility & systemUiFlag) == 0;
if (visible) { if (visible) {
info.globalVisibility &= ~systemUiFlag; info.globalVisibility &= ~systemUiFlag;
if (!wasVisible && hasControl) { if (hasControl && (mAttachInfo.mSystemUiVisibility & systemUiFlag) != 0) {
// The local system UI visibility can only be cleared while we have the control. // The local system UI visibility can only be cleared while we have the control.
info.localChanges |= systemUiFlag; info.localChanges |= systemUiFlag;
} }