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

Merge updateImeFocusable() into onPostWindowFocus()

Browse Source 
This is mechanical refactoring.  There must be no behavior change.

Bug: 234882948
Test: presubmit
Change-Id: I49665b3832de75238243227acc76be58dceb50fc
This commit is contained in:
Yohei Yukawa
2022-10-13 23:06:47 -07:00
parent cbeadf8f71
commit f324eaba3c
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,17 +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
void updateImeFocusable(WindowManager.LayoutParams windowAttribute) {
mHasImeFocus = WindowManager.LayoutParams.mayUseInputMethod(windowAttribute.flags);
}
@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);
mImeFocusController.onPreWindowFocus(hasWindowFocus, mWindowAttributes);
if (mView != null) {