Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38c72568 authored by Adrian Roos's avatar Adrian Roos Committed by Automerger Merge Worker
Browse files

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

Merge "ViewRootImpl: peek IME source instead of creating it" into sc-v2-dev am: 3f7eca56 am: 712c6095

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16358839

Change-Id: I070d043279efb139bd79bca361aa0e4fbf827707
parents 99e1b448 712c6095

core/java/android/view/ViewRootImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -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 */);

        }