Merge "ViewRootImpl: peek IME source instead of creating it" into sc-v2-dev

This commit is contained in:
Adrian Roos
2021-12-01 15:09:27 +00:00
committed by Android (Google) Code Review

View File

@@ -8411,7 +8411,7 @@ public final class ViewRootImpl implements ViewParent,
if (mTranslator != null) { if (mTranslator != null) {
mTranslator.translateInsetsStateInScreenToAppWindow(insetsState); mTranslator.translateInsetsStateInScreenToAppWindow(insetsState);
} }
if (insetsState != null && insetsState.getSource(ITYPE_IME).isVisible()) { if (insetsState != null && insetsState.getSourceOrDefaultVisibility(ITYPE_IME)) {
ImeTracing.getInstance().triggerClientDump("ViewRootImpl#dispatchInsetsChanged", ImeTracing.getInstance().triggerClientDump("ViewRootImpl#dispatchInsetsChanged",
getInsetsController().getHost().getInputMethodManager(), null /* icProto */); getInsetsController().getHost().getInputMethodManager(), null /* icProto */);
} }
@@ -8436,7 +8436,7 @@ public final class ViewRootImpl implements ViewParent,
mTranslator.translateInsetsStateInScreenToAppWindow(insetsState); mTranslator.translateInsetsStateInScreenToAppWindow(insetsState);
mTranslator.translateSourceControlsInScreenToAppWindow(activeControls); mTranslator.translateSourceControlsInScreenToAppWindow(activeControls);
} }
if (insetsState != null && insetsState.getSource(ITYPE_IME).isVisible()) { if (insetsState != null && insetsState.getSourceOrDefaultVisibility(ITYPE_IME)) {
ImeTracing.getInstance().triggerClientDump("ViewRootImpl#dispatchInsetsControlChanged", ImeTracing.getInstance().triggerClientDump("ViewRootImpl#dispatchInsetsControlChanged",
getInsetsController().getHost().getInputMethodManager(), null /* icProto */); getInsetsController().getHost().getInputMethodManager(), null /* icProto */);
} }