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

Commit 142218b1 authored by Adrian Roos's avatar Adrian Roos
Browse files

IME Insets: Remove obsolete applyImeVisibility call 

Test: atest InsetsControllerTest ImeInsetsSourceConsumerTest
Bug: 167947407
Change-Id: I8abb210eb20a17f5dfd6d071c57838afb9deb263
parent e148e669

core/java/android/view/ImeInsetsSourceConsumer.java

+0 −4
Original line number Diff line number Diff line
@@ -50,10 +50,6 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer { 
        super(ITYPE_IME, state, transactionSupplier, controller);

    }



    public void applyImeVisibility(boolean setVisible) {

        mController.applyImeVisibility(setVisible);

    }



    @Override

    public void onWindowFocusGained() {

        super.onWindowFocusGained();

core/java/android/view/InsetsController.java

+2 −14
Original line number Diff line number Diff line
@@ -878,7 +878,8 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
        hide(types, false /* fromIme */);

    }



    void hide(@InsetsType int types, boolean fromIme) {

    @VisibleForTesting

    public void hide(@InsetsType int types, boolean fromIme) {

        if (fromIme) {

            ImeTracing.getInstance().triggerClientDump("InsetsController#hide",

                    mHost.getInputMethodManager(), null /* icProto */);
@@ -1270,19 +1271,6 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
        getSourceConsumer(ITYPE_IME).onWindowFocusLost();

    }



    /**

     * Used by {@link ImeInsetsSourceConsumer} when IME decides to be shown/hidden.

     * @hide

     */

    @VisibleForTesting

    public void applyImeVisibility(boolean setVisible) {

        if (setVisible) {

            show(Type.IME, true /* fromIme */);

        } else {

            hide(Type.IME);

        }

    }



    @VisibleForTesting

    public @AnimationType int getAnimationType(@InternalInsetsType int type) {

        for (int i = mRunningAnimations.size() - 1; i >= 0; i--) {

core/java/android/view/inputmethod/InputMethodManager.java

+0 −18
Original line number Diff line number Diff line
@@ -492,7 +492,6 @@ public final class InputMethodManager { 
    static final int MSG_TIMEOUT_INPUT_EVENT = 6;

    static final int MSG_FLUSH_INPUT_EVENT = 7;

    static final int MSG_REPORT_FULLSCREEN_MODE = 10;

    static final int MSG_APPLY_IME_VISIBILITY = 20;

    static final int MSG_UPDATE_ACTIVITY_VIEW_TO_SCREEN_MATRIX = 30;



    private static boolean isAutofillUIShowing(View servedView) {
@@ -954,17 +953,6 @@ public final class InputMethodManager { 
                    }

                    return;

                }

                case MSG_APPLY_IME_VISIBILITY: {

                    synchronized (mH) {

                        if (mImeInsetsConsumer != null) {

                            ImeTracing.getInstance().triggerClientDump(

                                    "ImeInsetsSourceConsumer#applyImeVisibility",

                                    InputMethodManager.this, null /* icProto */);

                            mImeInsetsConsumer.applyImeVisibility(msg.arg1 != 0);

                        }

                    }

                    return;

                }

                case MSG_UPDATE_ACTIVITY_VIEW_TO_SCREEN_MATRIX: {

                    final float[] matrixValues = (float[]) msg.obj;

                    final int bindSequence = msg.arg1;
@@ -1146,12 +1134,6 @@ public final class InputMethodManager { 
                    .sendToTarget();

        }



        @Override

        public void applyImeVisibility(boolean setVisible) {

            mH.obtainMessage(MSG_APPLY_IME_VISIBILITY, setVisible ? 1 : 0, 0)

                    .sendToTarget();

        }



        @Override

        public void updateActivityViewToScreenMatrix(int bindSequence, float[] matrixValues) {

            mH.obtainMessage(MSG_UPDATE_ACTIVITY_VIEW_TO_SCREEN_MATRIX, bindSequence, 0,

core/java/com/android/internal/view/IInputMethodClient.aidl

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ oneway interface IInputMethodClient { 
    void setActive(boolean active, boolean fullscreen, boolean reportToImeController);

    void scheduleStartInputIfNecessary(boolean fullscreen);

    void reportFullscreenMode(boolean fullscreen);

    void applyImeVisibility(boolean setVisible);

    void updateActivityViewToScreenMatrix(int bindSequence, in float[] matrixValues);

    void setImeTraceEnabled(boolean enabled);

}

core/tests/coretests/src/android/view/ImeInsetsSourceConsumerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -97,12 +97,12 @@ public class ImeInsetsSourceConsumerTest { 
        InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {

            // test if setVisibility can show IME

            mImeConsumer.onWindowFocusGained();

            mImeConsumer.applyImeVisibility(true);

            mController.show(WindowInsets.Type.ime(), true /* fromIme */);

            mController.cancelExistingAnimations();

            assertTrue(mController.getSourceConsumer(ime.getType()).isRequestedVisible());



            // test if setVisibility can hide IME

            mImeConsumer.applyImeVisibility(false);

            mController.hide(WindowInsets.Type.ime(), true /* fromIme */);

            mController.cancelExistingAnimations();

            assertFalse(mController.getSourceConsumer(ime.getType()).isRequestedVisible());

        });
@@ -116,7 +116,7 @@ public class ImeInsetsSourceConsumerTest { 
        InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {

            // Request IME visible before control is available.

            mImeConsumer.onWindowFocusGained();

            mImeConsumer.applyImeVisibility(true /* setVisible */);

            mController.show(WindowInsets.Type.ime(), true /* fromIme */);



            // set control and verify visibility is applied.

            InsetsSourceControl control = new InsetsSourceControl(ITYPE_IME, mLeash, new Point());
@@ -134,7 +134,7 @@ public class ImeInsetsSourceConsumerTest { 
        InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {

            // Request IME visible before control is available.

            mImeConsumer.onWindowFocusGained();

            mImeConsumer.applyImeVisibility(true /* setVisible */);

            mController.show(WindowInsets.Type.ime(), true /* fromIme */);



            // set control and verify visibility is applied.

            InsetsSourceControl control = Mockito.spy(