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

Commit e27ccf7c authored by Antonio Kantek's avatar Antonio Kantek Committed by Android (Google) Code Review
Browse files

Merge "Add feature flag for concurrent multi-session IME" into main

parents 12817500 20f5b8ba

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -12848,6 +12848,7 @@ package android.content.pm { 
    field public static final String FEATURE_CAMERA_LEVEL_FULL = "android.hardware.camera.level.full";

    field public static final String FEATURE_CAMERA_LEVEL_FULL = "android.hardware.camera.level.full";

    field public static final String FEATURE_CANT_SAVE_STATE = "android.software.cant_save_state";

    field public static final String FEATURE_CANT_SAVE_STATE = "android.software.cant_save_state";

    field public static final String FEATURE_COMPANION_DEVICE_SETUP = "android.software.companion_device_setup";

    field public static final String FEATURE_COMPANION_DEVICE_SETUP = "android.software.companion_device_setup";

    field @FlaggedApi("android.view.inputmethod.concurrent_input_methods") public static final String FEATURE_CONCURRENT_INPUT_METHODS = "android.software.concurrent_input_methods";

    field @Deprecated public static final String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";

    field @Deprecated public static final String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";

    field public static final String FEATURE_CONSUMER_IR = "android.hardware.consumerir";

    field public static final String FEATURE_CONSUMER_IR = "android.hardware.consumerir";

    field public static final String FEATURE_CONTROLS = "android.software.controls";

    field public static final String FEATURE_CONTROLS = "android.software.controls";

core/java/android/content/pm/PackageManager.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -4017,6 +4017,15 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_INPUT_METHODS = "android.software.input_methods";

    public static final String FEATURE_INPUT_METHODS = "android.software.input_methods";





    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports multiple concurrent IME sessions.

     */

    @FlaggedApi("android.view.inputmethod.concurrent_input_methods")

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_CONCURRENT_INPUT_METHODS =

            "android.software.concurrent_input_methods";



    /**

    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports device policy enforcement via device admins.

     * {@link #hasSystemFeature}: The device supports device policy enforcement via device admins.

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

+9 −1
Original line number Original line Diff line number Diff line
@@ -23,3 +23,11 @@ flag { 
    bug: "301713309"

    bug: "301713309"

    is_fixed_read_only: true

    is_fixed_read_only: true

}

}



flag {

    name: "concurrent_input_methods"

    namespace: "input_method"

    description: "Feature flag for concurrent multi-session IME"

    bug: "284527000"

    is_fixed_read_only: true

}