summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adrian Roos <roosa@google.com> 2021-12-01 15:09:27 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-12-01 15:09:27 +0000
commit3f7eca5695555863eff64a44d11befe25ad4ada5 (patch)
treee53beeab740d624415632b39b7f0c4771773d836
parent0658235d8625ec4689e76fb7002e46bc938bda08 (diff)
parentbf551fe111769196db688971776c2d01979c775a (diff)
Merge "ViewRootImpl: peek IME source instead of creating it" into sc-v2-dev
-rw-r--r--core/java/android/view/ViewRootImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index d053def6abe2..f1eb783726db 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -8411,7 +8411,7 @@ public final class ViewRootImpl implements ViewParent,
if (mTranslator != null) {
mTranslator.translateInsetsStateInScreenToAppWindow(insetsState);
}
- if (insetsState != null && insetsState.getSource(ITYPE_IME).isVisible()) {
+ if (insetsState != null && insetsState.getSourceOrDefaultVisibility(ITYPE_IME)) {
ImeTracing.getInstance().triggerClientDump("ViewRootImpl#dispatchInsetsChanged",
getInsetsController().getHost().getInputMethodManager(), null /* icProto */);
}
@@ -8436,7 +8436,7 @@ public final class ViewRootImpl implements ViewParent,
mTranslator.translateInsetsStateInScreenToAppWindow(insetsState);
mTranslator.translateSourceControlsInScreenToAppWindow(activeControls);
}
- if (insetsState != null && insetsState.getSource(ITYPE_IME).isVisible()) {
+ if (insetsState != null && insetsState.getSourceOrDefaultVisibility(ITYPE_IME)) {
ImeTracing.getInstance().triggerClientDump("ViewRootImpl#dispatchInsetsControlChanged",
getInsetsController().getHost().getInputMethodManager(), null /* icProto */);
}