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

Commit 8278ade5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Hide IME on CC displays" into main

parents 2a8fe6ac 96d5cfea

services/companion/java/com/android/server/companion/virtual/computercontrol/ComputerControlSessionImpl.java

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.os.UserHandle; 
import android.view.Display;

import android.view.DisplayInfo;

import android.view.Surface;

import android.view.WindowManager;



import java.util.Objects;

import java.util.concurrent.atomic.AtomicInteger;
@@ -114,6 +115,9 @@ final class ComputerControlSessionImpl extends IComputerControlSession.Stub { 
                    mVirtualDevice.createVirtualDisplay(

                            virtualDisplayConfig, virtualDisplayCallback));



            mVirtualDevice.setDisplayImePolicy(

                    mVirtualDisplayId, WindowManager.DISPLAY_IME_POLICY_HIDE);



            String dpadName = mParams.name + "-dpad";

            VirtualDpadConfig virtualDpadConfig =

                    new VirtualDpadConfig.Builder()

services/tests/servicestests/src/com/android/server/companion/virtual/computercontrol/ComputerControlSessionTest.java

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.hardware.input.VirtualTouchscreenConfig; 
import android.os.Binder;

import android.os.IBinder;

import android.view.Surface;

import android.view.WindowManager;



import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -129,6 +130,9 @@ public class ComputerControlSessionTest { 
                | DisplayManager.VIRTUAL_DISPLAY_FLAG_ALWAYS_UNLOCKED;

        assertThat(virtualDisplayConfig.getFlags()).isEqualTo(expectedDisplayFlags);



        verify(mVirtualDevice).setDisplayImePolicy(

                VIRTUAL_DISPLAY_ID, WindowManager.DISPLAY_IME_POLICY_HIDE);



        verify(mVirtualDevice).createVirtualDpad(

                mVirtualDpadConfigArgumentCaptor.capture(), any());

        VirtualDpadConfig virtualDpadConfig = mVirtualDpadConfigArgumentCaptor.getValue();