Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set mNextServedView as null only when current served view lost focus" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-14 00:26:57 +00:00
committed by Android (Google) Code Review
parent eeff2cf753 ec78f00fe9
commit 62748d0a66
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/ImeFocusController.java
View File

@@ -165,10 +165,16 @@ public final class ImeFocusController {
if (!getImmDelegate().isCurrentRootView(view.getViewRootImpl())) { if (!getImmDelegate().isCurrentRootView(view.getViewRootImpl())) {
return; return;
} }
if (mServedView == view || !view.hasImeFocus() || !view.hasWindowFocus()) { if (!view.hasImeFocus() || !view.hasWindowFocus()) {
return; return;
} }
mNextServedView = hasFocus ? view : null; if (DEBUG) Log.d(TAG, "onViewFocusChanged, view=" + view + ", mServedView=" + mServedView);
if (hasFocus) {
mNextServedView = view;
} else if (view == mServedView) {
mNextServedView = null;
}
mViewRootImpl.dispatchCheckFocus(); mViewRootImpl.dispatchCheckFocus();
} }