drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 90fcb2ad: Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb

Browse Source 
* commit '90fcb2ad9378ee89f6795942c2b065a32bc83895':
  Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
This commit is contained in:
Tadashi G. Takaoka
2011-01-20 05:19:35 -08:00
committed by Android Git Automerger
parent 956b9ed7fc 90fcb2ad93
commit 6c51e1fc9d
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/11.xml
View File

@ -163324,22 +163324,22 @@
visibility="public" visibility="public"
> >
</field> </field>
<field name="ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER" <field name="ACTION_INPUT_METHOD_SETTINGS"
type="java.lang.String" type="java.lang.String"
transient="false" transient="false"
volatile="false" volatile="false"
value="&quot;android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER&quot;" value="&quot;android.settings.INPUT_METHOD_SETTINGS&quot;"
static="true" static="true"
final="true" final="true"
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
</field> </field>
<field name="ACTION_INPUT_METHOD_SETTINGS" <field name="ACTION_INPUT_METHOD_SUBTYPE_SETTINGS"
type="java.lang.String" type="java.lang.String"
transient="false" transient="false"
volatile="false" volatile="false"
value="&quot;android.settings.INPUT_METHOD_SETTINGS&quot;" value="&quot;android.settings.INPUT_METHOD_SUBTYPE_SETTINGS&quot;"
static="true" static="true"
final="true" final="true"
deprecated="not deprecated" deprecated="not deprecated"

8
api/current.xml
View File

@ -164808,22 +164808,22 @@
visibility="public" visibility="public"
> >
</field> </field>
<field name="ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER" <field name="ACTION_INPUT_METHOD_SETTINGS"
type="java.lang.String" type="java.lang.String"
transient="false" transient="false"
volatile="false" volatile="false"
value="&quot;android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER&quot;" value="&quot;android.settings.INPUT_METHOD_SETTINGS&quot;"
static="true" static="true"
final="true" final="true"
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
</field> </field>
<field name="ACTION_INPUT_METHOD_SETTINGS" <field name="ACTION_INPUT_METHOD_SUBTYPE_SETTINGS"
type="java.lang.String" type="java.lang.String"
transient="false" transient="false"
volatile="false" volatile="false"
value="&quot;android.settings.INPUT_METHOD_SETTINGS&quot;" value="&quot;android.settings.INPUT_METHOD_SUBTYPE_SETTINGS&quot;"
static="true" static="true"
final="true" final="true"
deprecated="not deprecated" deprecated="not deprecated"

6
core/java/android/provider/Settings.java
View File

@ -280,7 +280,7 @@ public final class Settings {
"android.settings.INPUT_METHOD_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> * <p>
* In some cases, a matching Activity may not exist, so ensure you * In some cases, a matching Activity may not exist, so ensure you
* safeguard against this. * safeguard against this.
@ -290,8 +290,8 @@ public final class Settings {
* Output: Nothing. * Output: Nothing.
*/ */
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER = public static final String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS =
"android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER"; "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";
/** /**
* Activity Action: Show settings to manage the user input dictionary. * Activity Action: Show settings to manage the user input dictionary.

2
services/java/com/android/server/InputMethodManagerService.java
View File

@ -1640,7 +1640,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
} }
private void showInputMethodAndSubtypeEnabler(String inputMethodId) { 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.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
| Intent.FLAG_ACTIVITY_CLEAR_TOP); | Intent.FLAG_ACTIVITY_CLEAR_TOP);