am 90fcb2ad
: Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb
* commit '90fcb2ad9378ee89f6795942c2b065a32bc83895': Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
This commit is contained in:
@ -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=""android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER""
|
||||
value=""android.settings.INPUT_METHOD_SETTINGS""
|
||||
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=""android.settings.INPUT_METHOD_SETTINGS""
|
||||
value=""android.settings.INPUT_METHOD_SUBTYPE_SETTINGS""
|
||||
static="true"
|
||||
final="true"
|
||||
deprecated="not deprecated"
|
||||
|
@ -164808,22 +164808,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=""android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER""
|
||||
value=""android.settings.INPUT_METHOD_SETTINGS""
|
||||
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=""android.settings.INPUT_METHOD_SETTINGS""
|
||||
value=""android.settings.INPUT_METHOD_SUBTYPE_SETTINGS""
|
||||
static="true"
|
||||
final="true"
|
||||
deprecated="not deprecated"
|
||||
|
@ -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.
|
||||
|
@ -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);
|
||||
|
Reference in New Issue
Block a user