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

Commit 4d25bffb authored by Felix Stern's avatar Felix Stern
Browse files

Adding flags for usage of newly introduced InputMethodManager APIs 

Test: atest android.view.inputmethod.cts.installtests.MultiUserTest
Fix: 301713309
Change-Id: I9ba5500b8267f0c90075f2b64dc6a8e4c2ad2749
parent 8f23adcc

core/api/test-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -3804,14 +3804,14 @@ package android.view.inputmethod { 
  public final class InputMethodManager {

    method @RequiresPermission(android.Manifest.permission.TEST_INPUT_METHOD) public void addVirtualStylusIdForTestSession();

    method public int getDisplayId();

    method @NonNull @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public java.util.List<android.view.inputmethod.InputMethodInfo> getEnabledInputMethodListAsUser(@NonNull android.os.UserHandle);

    method @NonNull @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public java.util.List<android.view.inputmethod.InputMethodSubtype> getEnabledInputMethodSubtypeListAsUser(@NonNull String, boolean, @NonNull android.os.UserHandle);

    method @FlaggedApi("android.view.inputmethod.imm_userhandle_hostsidetests") @NonNull @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public java.util.List<android.view.inputmethod.InputMethodInfo> getEnabledInputMethodListAsUser(@NonNull android.os.UserHandle);

    method @FlaggedApi("android.view.inputmethod.imm_userhandle_hostsidetests") @NonNull @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public java.util.List<android.view.inputmethod.InputMethodSubtype> getEnabledInputMethodSubtypeListAsUser(@NonNull String, boolean, @NonNull android.os.UserHandle);

    method @NonNull @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public java.util.List<android.view.inputmethod.InputMethodInfo> getInputMethodListAsUser(int);

    method public boolean hasActiveInputConnection(@Nullable android.view.View);

    method @RequiresPermission(android.Manifest.permission.TEST_INPUT_METHOD) public boolean hasPendingImeVisibilityRequests();

    method @RequiresPermission(android.Manifest.permission.TEST_INPUT_METHOD) public boolean isCurrentRootView(@NonNull android.view.View);

    method @RequiresPermission(android.Manifest.permission.TEST_INPUT_METHOD) public boolean isInputMethodPickerShown();

    method @NonNull @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public boolean isStylusHandwritingAvailableAsUser(@NonNull android.os.UserHandle);

    method @FlaggedApi("android.view.inputmethod.imm_userhandle_hostsidetests") @NonNull @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public boolean isStylusHandwritingAvailableAsUser(@NonNull android.os.UserHandle);

    method @RequiresPermission(android.Manifest.permission.TEST_INPUT_METHOD) public void setStylusWindowIdleTimeoutForTest(long);

    field public static final long CLEAR_SHOW_FORCED_FLAG_WHEN_LEAVING = 214016041L; // 0xcc1a029L

  }

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

+6 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.Manifest; 
import android.annotation.DisplayContext;

import android.annotation.DrawableRes;

import android.annotation.DurationMillisLong;

import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -1513,6 +1514,7 @@ public final class InputMethodManager { 
     * Returns {@code true} if currently selected IME supports Stylus handwriting & is enabled.

     * If the method returns {@code false}, {@link #startStylusHandwriting(View)} shouldn't be

     * called and Stylus touch should continue as normal touch input.

     *

     * @see #startStylusHandwriting(View)

     */

    public boolean isStylusHandwritingAvailable() {
@@ -1536,6 +1538,7 @@ public final class InputMethodManager { 
    @NonNull

    @RequiresPermission(value = Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional = true)

    @TestApi

    @FlaggedApi(Flags.FLAG_IMM_USERHANDLE_HOSTSIDETESTS)

    @SuppressLint("UserHandle")

    public boolean isStylusHandwritingAvailableAsUser(@NonNull UserHandle user) {

        final Context fallbackContext = ActivityThread.currentApplication();
@@ -1656,6 +1659,7 @@ public final class InputMethodManager { 
    @NonNull

    @RequiresPermission(value = Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional = true)

    @TestApi

    @FlaggedApi(Flags.FLAG_IMM_USERHANDLE_HOSTSIDETESTS)

    @SuppressLint("UserHandle")

    public List<InputMethodInfo> getEnabledInputMethodListAsUser(@NonNull UserHandle user) {

        return IInputMethodManagerGlobalInvoker.getEnabledInputMethodList(user.getIdentifier());
@@ -1691,12 +1695,13 @@ public final class InputMethodManager { 
     *               {@link Manifest.permission#INTERACT_ACROSS_USERS_FULL} is required if this is

     *               different from the calling process user ID.

     * @return {@link List} of {@link InputMethodSubtype}.

     * @see #getEnabledInputMethodListAsUser(int)

     * @see #getEnabledInputMethodListAsUser(UserHandle)

     * @hide

     */

    @NonNull

    @RequiresPermission(value = Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional = true)

    @TestApi

    @FlaggedApi(Flags.FLAG_IMM_USERHANDLE_HOSTSIDETESTS)

    @SuppressLint("UserHandle")

    public List<InputMethodSubtype> getEnabledInputMethodSubtypeListAsUser(

            @NonNull String imeId, boolean allowsImplicitlyEnabledSubtypes,

core/java/android/view/inputmethod/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -15,3 +15,11 @@ flag { 
    bug: "293898187"

    is_fixed_read_only: true

}



flag {

    name: "imm_userhandle_hostsidetests"

    namespace: "input_method"

    description: "Feature flag for replacing UserIdInt with UserHandle in some helper IMM functions"

    bug: "301713309"

    is_fixed_read_only: true

}
 
 No newline at end of file