Merge "Only apply server visible to split screen" into rvc-dev

This commit is contained in:
Yunfan Chen
2020-06-24 08:09:57 +00:00
committed by Android (Google) Code Review

View File

@@ -351,9 +351,13 @@ class InsetsSourceProvider {
} }
private void updateVisibility() { private void updateVisibility() {
// TODO(b/159699383): remove the client controlled check when the insets visibility can be
// driven by the system UI.
final boolean isClientControlled = mControlTarget != null final boolean isClientControlled = mControlTarget != null
&& mControlTarget.isClientControlled(); && mControlTarget.isClientControlled();
mSource.setVisible(mServerVisible && (!isClientControlled || mClientVisible)); mSource.setVisible(mServerVisible
&& ((!isClientControlled && mDisplayContent.inMultiWindowMode())
|| mClientVisible));
ProtoLog.d(WM_DEBUG_IME, ProtoLog.d(WM_DEBUG_IME,
"InsetsSource updateVisibility serverVisible: %s clientVisible: %s", "InsetsSource updateVisibility serverVisible: %s clientVisible: %s",
mServerVisible, mClientVisible); mServerVisible, mClientVisible);