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

Commit 90fcb2ad authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb

parents 7ccaba69 f49688fa

api/11.xml

+4 −4
Original line number Diff line number Diff line
@@ -163324,22 +163324,22 @@ 
 visibility="public"

>

</field>

<field name="ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER"

<field name="ACTION_INPUT_METHOD_SETTINGS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER&quot;"

 value="&quot;android.settings.INPUT_METHOD_SETTINGS&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ACTION_INPUT_METHOD_SETTINGS"

<field name="ACTION_INPUT_METHOD_SUBTYPE_SETTINGS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.settings.INPUT_METHOD_SETTINGS&quot;"

 value="&quot;android.settings.INPUT_METHOD_SUBTYPE_SETTINGS&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

api/current.xml

+4 −4
Original line number Diff line number Diff line
@@ -163345,22 +163345,22 @@ 
 visibility="public"

>

</field>

<field name="ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER"

<field name="ACTION_INPUT_METHOD_SETTINGS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER&quot;"

 value="&quot;android.settings.INPUT_METHOD_SETTINGS&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="ACTION_INPUT_METHOD_SETTINGS"

<field name="ACTION_INPUT_METHOD_SUBTYPE_SETTINGS"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.settings.INPUT_METHOD_SETTINGS&quot;"

 value="&quot;android.settings.INPUT_METHOD_SUBTYPE_SETTINGS&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

core/java/android/provider/Settings.java

+3 −3
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ public final class Settings { 
            "android.settings.INPUT_METHOD_SETTINGS";



    /**

     * Activity Action: Show enabler activity to enable/disable input methods and subtypes.

     * Activity Action: Show settings to enable/disable input method subtypes.

     * <p>

     * In some cases, a matching Activity may not exist, so ensure you

     * safeguard against this.
@@ -290,8 +290,8 @@ public final class Settings { 
     * Output: Nothing.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER =

            "android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER";

    public static final String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS =

            "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";



    /**

     * Activity Action: Show settings to manage the user input dictionary.

services/java/com/android/server/InputMethodManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1640,7 +1640,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
    }



    private void showInputMethodAndSubtypeEnabler(String inputMethodId) {

        Intent intent = new Intent(Settings.ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER);

        Intent intent = new Intent(Settings.ACTION_INPUT_METHOD_SUBTYPE_SETTINGS);

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED

                | Intent.FLAG_ACTIVITY_CLEAR_TOP);