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

Commit cfbe0527 authored by Taran Singh's avatar Taran Singh Committed by Automerger Merge Worker
Browse files

Merge "Add test for ImeInsetsSourceConsumer" into rvc-dev am: 88191952 

Change-Id: Ibb292869e3bd82308dd805f6935cfe1159c9e822
parents 05470139 88191952

core/java/android/view/InsetsController.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1002,7 +1002,8 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation 
        }

        }

    }

    }





    private void applyAnimation(@InsetsType final int types, boolean show, boolean fromIme) {

    @VisibleForTesting

    public void applyAnimation(@InsetsType final int types, boolean show, boolean fromIme) {

        if (types == 0) {

        if (types == 0) {

            // nothing to animate.

            // nothing to animate.

            return;

            return;

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

+30 −5
Original line number Original line Diff line number Diff line
@@ -23,13 +23,16 @@ import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; 
import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertTrue;

import static junit.framework.Assert.assertTrue;





import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.verify;



import android.content.Context;

import android.content.Context;

import android.graphics.Insets;

import android.graphics.Insets;

import android.graphics.Point;

import android.graphics.Point;

import android.graphics.Rect;

import android.graphics.Rect;

import android.os.Bundle;

import android.os.Bundle;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.Presubmit;

import android.view.SurfaceControl.Transaction;

import android.view.WindowManager.BadTokenException;

import android.view.WindowManager.BadTokenException;

import android.view.WindowManager.LayoutParams;

import android.view.WindowManager.LayoutParams;

import android.view.inputmethod.EditorInfo;

import android.view.inputmethod.EditorInfo;
@@ -42,6 +45,8 @@ import androidx.test.platform.app.InstrumentationRegistry; 
import org.junit.Before;

import org.junit.Before;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.mockito.Mockito;

import org.mockito.Spy;





import java.util.ArrayList;

import java.util.ArrayList;
@@ -58,7 +63,7 @@ public class ImeInsetsSourceConsumerTest { 




    Context mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();

    Context mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();

    ImeInsetsSourceConsumer mImeConsumer;

    ImeInsetsSourceConsumer mImeConsumer;

    InsetsController mController;

    @Spy InsetsController mController;

    SurfaceControl mLeash;

    SurfaceControl mLeash;





    @Before

    @Before
@@ -73,7 +78,7 @@ public class ImeInsetsSourceConsumerTest { 
            } catch (BadTokenException e) {

            } catch (BadTokenException e) {

                // activity isn't running, we will ignore BadTokenException.

                // activity isn't running, we will ignore BadTokenException.

            }

            }

            mController = new InsetsController(viewRootImpl);

            mController = Mockito.spy(new InsetsController(viewRootImpl));

            final Rect rect = new Rect(5, 5, 5, 5);

            final Rect rect = new Rect(5, 5, 5, 5);

            mController.calculateInsets(

            mController.calculateInsets(

                    false,

                    false,
@@ -81,8 +86,7 @@ public class ImeInsetsSourceConsumerTest { 
                    new DisplayCutout(

                    new DisplayCutout(

                            Insets.of(10, 10, 10, 10), rect, rect, rect, rect),

                            Insets.of(10, 10, 10, 10), rect, rect, rect, rect),

                    SOFT_INPUT_ADJUST_RESIZE, 0);

                    SOFT_INPUT_ADJUST_RESIZE, 0);

            mImeConsumer = new ImeInsetsSourceConsumer(

            mImeConsumer = (ImeInsetsSourceConsumer) mController.getSourceConsumer(ITYPE_IME);

                    new InsetsState(), Transaction::new, mController);

        });

        });

    }

    }
@@ -105,6 +109,27 @@ public class ImeInsetsSourceConsumerTest { 
        });

        });

    }

    }





    @Test

    public void testImeRequestedVisibleAwaitingControl() {

        // Set null control and then request show.

        mController.onControlsChanged(new InsetsSourceControl[] { null });



        InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {

            // Request IME visible before control is available.

            mImeConsumer.onWindowFocusGained();

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



            // set control and verify visibility is applied.

            InsetsSourceControl control = new InsetsSourceControl(ITYPE_IME, mLeash, new Point());

            mController.onControlsChanged(new InsetsSourceControl[] { control });

            // IME show animation should be triggered when control becomes available.

            verify(mController).applyAnimation(

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

            verify(mController, never()).applyAnimation(

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

        });

    }



    @Test

    @Test

    public void testAreEditorsSimilar() {

    public void testAreEditorsSimilar() {

        EditorInfo info1 = new EditorInfo();

        EditorInfo info1 = new EditorInfo();