Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make InputMethodService be an UI context" into rvc-dev am: f3a7bc8e31 am: 84bf8d437c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11700778

Change-Id: Icc0862e7e5bddd0975a433d2946ef142478c71a8
This commit is contained in:
Charles Chen
2020-06-05 03:15:59 +00:00
committed by Automerger Merge Worker
parent fc326f93ae 84bf8d437c
commit 12981bae2a
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/inputmethodservice/AbstractInputMethodService.java
View File

@@ -260,4 +260,10 @@ public abstract class AbstractInputMethodService extends Service
*/ */
public void notifyUserActionIfNecessary() { public void notifyUserActionIfNecessary() {
} }
/** @hide */
@Override
public final boolean isUiContext() {
return true;
}
} }

9
core/tests/coretests/src/android/content/ContextTest.java
View File

@@ -23,12 +23,14 @@ import static android.view.Display.DEFAULT_DISPLAY;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import android.app.ActivityThread; import android.app.ActivityThread;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.graphics.PixelFormat; import android.graphics.PixelFormat;
import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManager;
import android.hardware.display.VirtualDisplay; import android.hardware.display.VirtualDisplay;
import android.inputmethodservice.InputMethodService;
import android.media.ImageReader; import android.media.ImageReader;
import android.os.UserHandle; import android.os.UserHandle;
import android.view.Display; import android.view.Display;
@@ -135,6 +137,13 @@ public class ContextTest {
assertThat(systemUiContext.isUiContext()).isTrue(); assertThat(systemUiContext.isUiContext()).isTrue();
} }
@Test
public void testIsUiContext_InputMethodService_returnsTrue() {
final InputMethodService ims = new InputMethodService();
assertTrue(ims.isUiContext());
}
@Test @Test
public void testGetDisplayFromDisplayContextDerivedContextOnPrimaryDisplay() { public void testGetDisplayFromDisplayContextDerivedContextOnPrimaryDisplay() {
verifyGetDisplayFromDisplayContextDerivedContext(false /* onSecondaryDisplay */); verifyGetDisplayFromDisplayContextDerivedContext(false /* onSecondaryDisplay */);