diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2011-01-20 05:17:51 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-20 05:17:51 -0800 |
| commit | 90fcb2ad9378ee89f6795942c2b065a32bc83895 (patch) | |
| tree | c5dfa3b8e46604a8a66e9011d1ab695b49f28eae /services | |
| parent | 7ccaba693bd328968baf3f117b286659ce4a2a75 (diff) | |
| parent | f49688fa17b70313c0734f00df73bc3308a749e9 (diff) | |
| download | frameworks_base-90fcb2ad9378ee89f6795942c2b065a32bc83895.zip frameworks_base-90fcb2ad9378ee89f6795942c2b065a32bc83895.tar.gz frameworks_base-90fcb2ad9378ee89f6795942c2b065a32bc83895.tar.bz2 | |
Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 4d40620..18a6fe0 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -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); |