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

Merge changes I49665b38,I0c63504f

Browse Source 
* changes:
  Merge updateImeFocusable() into onPostWindowFocus()
  Partly inline ImeFocusController#updateImeFocusable()
This commit is contained in:
TreeHugger Robot
2022-10-14 18:51:21 +00:00
committed by Android (Google) Code Review
parent e739ddf58c f324eaba3c
commit 7942003609
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/view/ImeFocusController.java
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;
}
@@ -83,22 +84,13 @@ public final class ImeFocusController {
@UiThread
void onPreWindowFocus(boolean hasWindowFocus, WindowManager.LayoutParams windowAttribute) {
mHasImeFocus = WindowManager.LayoutParams.mayUseInputMethod(windowAttribute.flags);
if (!hasWindowFocus || !mHasImeFocus || isInLocalFocusMode(windowAttribute)) {
return;
}
getImmDelegate().onPreWindowGainedFocus(mViewRootImpl);
}
@UiThread
boolean updateImeFocusable(WindowManager.LayoutParams windowAttribute, boolean force) {
final boolean hasImeFocus = WindowManager.LayoutParams.mayUseInputMethod(
windowAttribute.flags);
if (force) {
mHasImeFocus = hasImeFocus;
}
return hasImeFocus;
}
@UiThread
void onPostWindowFocus(View focusedView, boolean hasWindowFocus,
WindowManager.LayoutParams windowAttribute) {

1
core/java/android/view/ViewRootImpl.java
View File

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