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 am: 62748d0a66 am: 25bc08c735

Browse Source 
Change-Id: I44f3fc8287cc605f350dc6ef6d32d557a169b3ee
This commit is contained in:
Automerger Merge Worker
2020-03-14 01:02:24 +00:00
parent 562b570a52 25bc08c735
commit 9a482119f4
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())) {
return;
}
if (mServedView == view || !view.hasImeFocus() || !view.hasWindowFocus()) {
if (!view.hasImeFocus() || !view.hasWindowFocus()) {
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();
}