Merge "Register Ime consumer only when insets are enabled." into qt-dev

2019-04-24 19:34:20 +00:00
parent d0f57d3683 7928f7cd4d
commit c63ff2d590
1 changed files with 8 additions and 4 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -2814,10 +2814,14 @@ public final class ViewRootImpl implements ViewParent,
            hasWindowFocus = mUpcomingWindowFocus;
            inTouchMode = mUpcomingInTouchMode;
        }
-        if (hasWindowFocus) {
-            mInsetsController.onWindowFocusGained();
-        } else {
-            mInsetsController.onWindowFocusLost();
+        if (sNewInsetsMode != NEW_INSETS_MODE_NONE) {
+            // TODO (b/131181940): Make sure this doesn't leak Activity with mActivityConfigCallback
+            // config changes.
+            if (hasWindowFocus) {
+                mInsetsController.onWindowFocusGained();
+            } else {
+                mInsetsController.onWindowFocusLost();
+            }
        }

        if (mAdded) {