Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a49ea6f2 authored by Ming-Shin Lu's avatar Ming-Shin Lu
Browse files

Fix some IME transition issues 

- Add InsetsSource#getVisibleFrame to check if the launching task
  needs to disable fixed rotation:

  As CL[1] disables fixed rotation when IME surface exists for
  fixing IME janky when IME receiving different orientations.

  Even the CL used StartingData#hasImeSurface to forecast if needs to
  disable fixed rotation, it may hit some timing cases that StartingData
  not yet be prepared when launching the task next time quickly.

  Add InsetsSource#getVisibleFrame to prevent this edge case happen
  since this value will be updated when app client requests relayout.

- Consolide DC#isImeAttachedToApp() check:

  When recents animation started, will check whether
  the task has to hide soft-keyboard when it's not able to attach IME
  surface through DC#isImeAttachedToApp.

  Since this method only checks the layering target window states
  but not check if the IME surface has actually attached to the app.
  it might have potential issue that IME may state
  persistents when switching between tasks if we don't check if the
  actual IME container surface.

  Consolide DC#isImeSurfaceAttachedOnApp check to ensure hiding keyboard
  in RecentsAnimationController as the above potential case.
  (Also renamed the original DC#isImeAttachedToApp as
   DC#shouldImeAttachedToApp to make it easier understand the difference
   within the new isImeAttachedToApp.)

[1]: Idfdf129adbfbee6634d8a27aa78da1f631bd213b

Fix: 160451808
Bug: 184020899
Test: manual as below steps
1) launching the app with focusing IME in portrait mode.
2) swiping out to launcher
3) rotate the device in landscape
4) tapping the shortcut to launch the app again
5) repeat 1-4, see if IME surface will mess up to see both portrait
   and landcape surface.

Change-Id: I966ab69f260f828b6e96b3479a36467181288504
parent 0945ce8e

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -6851,7 +6851,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

        // An activity in size compatibility mode may have override bounds which equals to its

        // parent bounds, so the exact bounds should also be checked to allow IME window to attach

        // to the activity. See {@link DisplayContent#isImeAttachedToApp}.

        // to the activity. See {@link DisplayContent#shouldImeAttachedToApp}.

        final WindowContainer parent = getParent();

        return parent == null || parent.getBounds().equals(overrideBounds);

    }

services/core/java/com/android/server/wm/DisplayContent.java

+20 −4
Original line number Diff line number Diff line
@@ -1531,7 +1531,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
            // to cover the activity configuration change.

            return false;

        }

        if (r.mStartingData != null && r.mStartingData.hasImeSurface()) {

        if ((r.mStartingData != null && r.mStartingData.hasImeSurface())

                || (mInsetsStateController.getImeSourceProvider()

                        .getSource().getVisibleFrame() != null)) {

            // Currently it is unknown that when will IME window be ready. Reject the case to

            // avoid flickering by showing IME in inconsistent orientation.

            return false;
@@ -3621,7 +3623,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        return mImeInputTarget != null && !mImeInputTarget.inMultiWindowMode();

    }



    boolean isImeAttachedToApp() {

    boolean shouldImeAttachedToApp() {

        return isImeControlledByApp()

                && mImeLayeringTarget != null

                && mImeLayeringTarget.mActivityRecord != null
@@ -3634,6 +3636,20 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
                && mImeLayeringTarget.matchesDisplayAreaBounds();

    }



    /**

     * Unlike {@link #shouldImeAttachedToApp()}, this method returns {@code @true} only when both

     * the IME layering target is valid to attach the IME surface to the app, and the

     * {@link #mInputMethodSurfaceParent} of the {@link ImeContainer} has actually attached to

     * the app. (i.e. Even if {@link #shouldImeAttachedToApp()} returns {@code true}, calling this

     * method will return {@code false} if the IME surface doesn't actually attach to the app.)

     */

    boolean isImeAttachedToApp() {

        return shouldImeAttachedToApp()

                && mInputMethodSurfaceParent != null

                && mInputMethodSurfaceParent.isSameSurface(

                        mImeLayeringTarget.mActivityRecord.getSurfaceControl());

    }



    /**

     * Finds the window which can host IME if IME target cannot host it.

     * e.g. IME target cannot host IME when it's display has a parent display OR when display
@@ -3762,7 +3778,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    @VisibleForTesting

    void attachAndShowImeScreenshotOnTarget() {

        // No need to attach screenshot if the IME target not exists or screen is off.

        if (!isImeAttachedToApp() || !mWmService.mPolicy.isScreenOn()) {

        if (!shouldImeAttachedToApp() || !mWmService.mPolicy.isScreenOn()) {

            return;

        }
@@ -3930,7 +3946,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        // Attach it to app if the target is part of an app and such app is covering the entire

        // screen. If it's not covering the entire screen the IME might extend beyond the apps

        // bounds.

        if (allowAttachToApp && isImeAttachedToApp()) {

        if (allowAttachToApp && shouldImeAttachedToApp()) {

            return mImeLayeringTarget.mActivityRecord.getSurfaceControl();

        }

services/core/java/com/android/server/wm/TaskSnapshotController.java

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ class TaskSnapshotController { 
        final WindowState imeWindow = task.getDisplayContent().mInputMethodWindow;

        // Exclude IME window snapshot when IME isn't proper to attach to app.

        final boolean excludeIme = imeWindow != null && imeWindow.getSurfaceControl() != null

                && !task.getDisplayContent().isImeAttachedToApp();

                && !task.getDisplayContent().shouldImeAttachedToApp();

        final WindowState navWindow =

                task.getDisplayContent().getDisplayPolicy().getNavigationBar();

        // If config_attachNavBarToAppDuringTransition is true, the nav bar will be reparent to the

services/core/java/com/android/server/wm/WindowState.java

+1 −1
Original line number Diff line number Diff line
@@ -2309,7 +2309,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        // When the window configuration changed, we need to update the IME control target in

        // case the app may lose the IME inets control when exiting from split-screen mode, or the

        // IME parent may failed to attach to the app during rotating the screen.

        // See DisplayContent#isImeAttachedToApp, DisplayContent#isImeControlledByApp

        // See DisplayContent#shouldImeAttachedToApp, DisplayContent#isImeControlledByApp

        if (windowConfigChanged) {

            getDisplayContent().updateImeControlTarget();

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -1904,7 +1904,7 @@ public class DisplayContentTests extends WindowTestsBase { 
        mDisplayContent.setImeInputTarget(appWin2);

        mDisplayContent.computeImeTarget(true);

        assertEquals(appWin2, mDisplayContent.getImeTarget(IME_TARGET_LAYERING));

        assertTrue(mDisplayContent.isImeAttachedToApp());

        assertTrue(mDisplayContent.shouldImeAttachedToApp());



        verify(mDisplayContent, atLeast(1)).attachAndShowImeScreenshotOnTarget();

        verify(mWm.mTaskSnapshotController).snapshotImeFromAttachedTask(appWin1.getTask());