diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/method.xml | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SettingsActivity.java | 6 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SubtypeSwitcher.java | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index cb0a9a2e1..57466396b 100644 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -21,7 +21,7 @@ <meta-data android:name="android.view.im" android:resource="@xml/method" /> </service> - <activity android:name="Settings" android:label="@string/english_ime_settings"> + <activity android:name="SettingsActivity" android:label="@string/english_ime_settings"> <intent-filter> <action android:name="android.intent.action.MAIN"/> </intent-filter> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 7aaf57b47..43e72ce5f 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -28,7 +28,7 @@ <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default subtype.--> <input-method xmlns:android="http://schemas.android.com/apk/res/android" - android:settingsActivity="com.android.inputmethod.latin.Settings" + android:settingsActivity="com.android.inputmethod.latin.SettingsActivity" android:isDefault="@bool/im_is_default"> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_mode_en_US_keyboard" diff --git a/java/src/com/android/inputmethod/latin/SettingsActivity.java b/java/src/com/android/inputmethod/latin/SettingsActivity.java new file mode 100644 index 000000000..434d5d5ea --- /dev/null +++ b/java/src/com/android/inputmethod/latin/SettingsActivity.java @@ -0,0 +1,6 @@ +package com.android.inputmethod.latin; + +import android.os.Bundle; + +public class SettingsActivity extends Settings { +}
\ No newline at end of file diff --git a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java index 6ca12c0c5..8fc19ae87 100644 --- a/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java +++ b/java/src/com/android/inputmethod/latin/SubtypeSwitcher.java @@ -188,6 +188,8 @@ public class SubtypeSwitcher { // TODO: Update an icon for shortcut IME final Map<InputMethodInfoCompatWrapper, List<InputMethodSubtypeCompatWrapper>> shortcuts = mImm.getShortcutInputMethodsAndSubtypes(); + mShortcutInputMethodInfo = null; + mShortcutSubtype = null; for (InputMethodInfoCompatWrapper imi : shortcuts.keySet()) { List<InputMethodSubtypeCompatWrapper> subtypes = shortcuts.get(imi); // TODO: Returns the first found IMI for now. Should handle all shortcuts as |