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

Merge "Update IME parent onConfigurationChanged" into sc-dev

Browse Source
This commit is contained in:
Taran Singh
2021-05-18 15:40:30 +00:00
committed by Android (Google) Code Review
parent bd26d8f134 5fcf28e8bd
commit 7b1287818e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -2411,6 +2411,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
mDisplayPolicy.onConfigurationChanged(); mDisplayPolicy.onConfigurationChanged();
mPinnedTaskController.onPostDisplayConfigurationChanged(); mPinnedTaskController.onPostDisplayConfigurationChanged();
} }
// Update IME parent if needed.
updateImeParent();
if (lastOrientation != getConfiguration().orientation) { if (lastOrientation != getConfiguration().orientation) {
getMetricsLogger().write( getMetricsLogger().write(
@@ -3965,7 +3967,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
} }
// Otherwise, we just attach it to where the display area policy put it. // Otherwise, we just attach it to where the display area policy put it.
return mImeWindowsContainer.getParent().getSurfaceControl(); return mImeWindowsContainer.getParent() != null
? mImeWindowsContainer.getParent().getSurfaceControl() : null;
} }
void setLayoutNeeded() { void setLayoutNeeded() {

4
services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
View File

@@ -349,7 +349,9 @@ public class DisplayContentTests extends WindowTestsBase {
doReturn(imeSurfaceParent).when(mDisplayContent).computeImeParent(); doReturn(imeSurfaceParent).when(mDisplayContent).computeImeParent();
spyOn(imeContainer); spyOn(imeContainer);
mDisplayContent.updateImeParent(); mDisplayContent.setImeInputTarget(startingWin);
mDisplayContent.onConfigurationChanged(new Configuration());
verify(mDisplayContent).updateImeParent();
// Force reassign the relative layer when the IME surface parent is changed. // Force reassign the relative layer when the IME surface parent is changed.
verify(imeContainer).assignRelativeLayer(any(), eq(imeSurfaceParent), anyInt(), eq(true)); verify(imeContainer).assignRelativeLayer(any(), eq(imeSurfaceParent), anyInt(), eq(true));