diff options
| author | Adrian Roos <roosa@google.com> | 2021-12-01 15:36:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-01 15:36:54 +0000 |
| commit | 38c72568614ec614f4511ee4d3744a4e27a4a99a (patch) | |
| tree | bb2717dc518ea2e726b9d71da8691fbc9b9c8dfc /core/java/android | |
| parent | 99e1b4485b14dd17e63611c95a7b10fe448d699e (diff) | |
| parent | 712c609507f09f1b3ca1ae33ae17ad2a12921600 (diff) | |
Merge "ViewRootImpl: peek IME source instead of creating it" into sc-v2-dev am: 3f7eca5695 am: 712c609507
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16358839
Change-Id: I070d043279efb139bd79bca361aa0e4fbf827707
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 0c30cbb3e149..8f25902bd642 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -8291,7 +8291,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 */); } @@ -8316,7 +8316,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 */); } |