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

Commit 07280695 authored by Timothy Wang's avatar Timothy Wang Committed by Android (Google) Code Review
Browse files

Revert "Fix IME not shown from recents to split-screen task" 

This reverts commit a210826f.

Reason for revert: DroidMonitor: Potential culprit for Bug b/260534444 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: Id88fe6e3a4f9eea08aa812feaae92067be40950f
parent a210826f

libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayImeController.java

+1 −1
Original line number Diff line number Diff line
@@ -295,9 +295,9 @@ public class DisplayImeController implements DisplayController.OnDisplaysChanged 
                        mImeSourceControl.release(SurfaceControl::release);

                    }

                }

            }

                mImeSourceControl = imeSourceControl;

            }

        }



        private void applyVisibilityToLeash(InsetsSourceControl imeSourceControl) {

            SurfaceControl leash = imeSourceControl.getLeash();

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/DisplayImeControllerTest.java

+0 −18
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ import static android.view.InsetsState.ITYPE_IME; 
import static android.view.Surface.ROTATION_0;

import static android.view.WindowInsets.Type.ime;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.mock;
@@ -91,22 +89,6 @@ public class DisplayImeControllerTest extends ShellTestCase { 
        verifyZeroInteractions(mExecutor);

    }



    @Test

    public void insetsControlChanged_updateExpectedImeSourceControl() {

        final InsetsSourceControl[] insetsSourceControls = new InsetsSourceControl[]{

                new InsetsSourceControl(ITYPE_IME, mock(SurfaceControl.class), false,

                        new Point(0, 0), Insets.NONE)};

        final InsetsSourceControl imeSourceControl = insetsSourceControls[0];



        mPerDisplay.insetsControlChanged(insetsStateWithIme(false), insetsSourceControls);



        assertEquals(imeSourceControl, mPerDisplay.mImeSourceControl);



        mPerDisplay.insetsControlChanged(insetsStateWithIme(false), null);



        assertNull(mPerDisplay.mImeSourceControl);

    }



    @Test

    public void insetsChanged_schedulesNoWorkOnExecutor() {

        mPerDisplay.insetsChanged(insetsStateWithIme(false));