Partly inline ImeFocusController#updateImeFocusable()

This is mechanical refactoring.  There must be no observable behavior
change.

Bug: 234882948
Test: presubmit
Change-Id: I0c63504fc7fe665f7b7816bdcc7a6cb357482380
This commit is contained in:
Yohei Yukawa
2022-10-13 23:05:41 -07:00
parent e128f7da41
commit cbeadf8f71
2 changed files with 5 additions and 9 deletions

View File

@@ -65,7 +65,8 @@ public final class ImeFocusController {
@UiThread
void onTraversal(boolean hasWindowFocus, WindowManager.LayoutParams windowAttribute) {
final boolean hasImeFocus = updateImeFocusable(windowAttribute, false /* force */);
final boolean hasImeFocus = WindowManager.LayoutParams.mayUseInputMethod(
windowAttribute.flags);
if (!hasWindowFocus || isInLocalFocusMode(windowAttribute)) {
return;
}
@@ -90,13 +91,8 @@ public final class ImeFocusController {
}
@UiThread
boolean updateImeFocusable(WindowManager.LayoutParams windowAttribute, boolean force) {
final boolean hasImeFocus = WindowManager.LayoutParams.mayUseInputMethod(
windowAttribute.flags);
if (force) {
mHasImeFocus = hasImeFocus;
}
return hasImeFocus;
void updateImeFocusable(WindowManager.LayoutParams windowAttribute) {
mHasImeFocus = WindowManager.LayoutParams.mayUseInputMethod(windowAttribute.flags);
}
@UiThread

View File

@@ -3798,7 +3798,7 @@ public final class ViewRootImpl implements ViewParent,
}
mAttachInfo.mHasWindowFocus = hasWindowFocus;
mImeFocusController.updateImeFocusable(mWindowAttributes, true /* force */);
mImeFocusController.updateImeFocusable(mWindowAttributes);
mImeFocusController.onPreWindowFocus(hasWindowFocus, mWindowAttributes);
if (mView != null) {