Merge "Make InputMethodService be an UI context" into rvc-dev am: f3a7bc8e31 (504c1f0f) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/AbstractInputMethodService.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -260,4 +260,10 @@ public abstract class AbstractInputMethodService extends Service
		*/
		public void notifyUserActionIfNecessary() {
		}

		/** @hide */
		@Override
		public final boolean isUiContext() {
		return true;
		}
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -23,12 +23,14 @@ import static android.view.Display.DEFAULT_DISPLAY;
		import static com.google.common.truth.Truth.assertThat;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertTrue;

		import android.app.ActivityThread;
		import android.content.res.Configuration;
		import android.graphics.PixelFormat;
		import android.hardware.display.DisplayManager;
		import android.hardware.display.VirtualDisplay;
		import android.inputmethodservice.InputMethodService;
		import android.media.ImageReader;
		import android.os.UserHandle;
		import android.view.Display;
		@@ -135,6 +137,13 @@ public class ContextTest {
		assertThat(systemUiContext.isUiContext()).isTrue();
		}

		@Test
		public void testIsUiContext_InputMethodService_returnsTrue() {
		final InputMethodService ims = new InputMethodService();

		assertTrue(ims.isUiContext());
		}

		@Test
		public void testGetDisplayFromDisplayContextDerivedContextOnPrimaryDisplay() {
		verifyGetDisplayFromDisplayContextDerivedContext(false /* onSecondaryDisplay */);