diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-09-18 01:52:26 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-09-18 01:52:26 -0700 |
| commit | 3d184ea47b4bcc45ac5c461b89cacc700d4cf0e2 (patch) | |
| tree | 3df9971bf756d8918b41812ab59cebbbc6da8bc1 /java/src/com/android/inputmethod/latin/utils | |
| parent | 85df7bcd6c5fea1f980245d424319b34db5722ac (diff) | |
| parent | 957a2337eee3a075957d6c397396996febd78982 (diff) | |
| download | latinime-3d184ea47b4bcc45ac5c461b89cacc700d4cf0e2.tar.gz latinime-3d184ea47b4bcc45ac5c461b89cacc700d4cf0e2.tar.xz latinime-3d184ea47b4bcc45ac5c461b89cacc700d4cf0e2.zip | |
am 957a2337: Merge "Set EmojiCapable"
* commit '957a2337eee3a075957d6c397396996febd78982':
Set EmojiCapable
Diffstat (limited to 'java/src/com/android/inputmethod/latin/utils')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/AdditionalSubtypeUtils.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/utils/AdditionalSubtypeUtils.java b/java/src/com/android/inputmethod/latin/utils/AdditionalSubtypeUtils.java index 215faa0c7..3082bf4b7 100644 --- a/java/src/com/android/inputmethod/latin/utils/AdditionalSubtypeUtils.java +++ b/java/src/com/android/inputmethod/latin/utils/AdditionalSubtypeUtils.java @@ -25,6 +25,7 @@ import android.os.Build; import android.text.TextUtils; import android.view.inputmethod.InputMethodSubtype; +import com.android.inputmethod.latin.Constants; import com.android.inputmethod.latin.R; import java.util.ArrayList; @@ -61,8 +62,9 @@ public final class AdditionalSubtypeUtils { IS_ADDITIONAL_SUBTYPE, layoutDisplayNameExtraValue); final int nameId = SubtypeLocaleUtils.getSubtypeNameId(localeString, keyboardLayoutSetName); return new InputMethodSubtype(nameId, R.drawable.ic_subtype_keyboard, - localeString, KEYBOARD_MODE, - layoutExtraValue + "," + additionalSubtypeExtraValue, false, false); + localeString, KEYBOARD_MODE, layoutExtraValue + "," + additionalSubtypeExtraValue + + "," + Constants.Subtype.ExtraValue.ASCII_CAPABLE + + "," + Constants.Subtype.ExtraValue.EMOJI_CAPABLE, false, false); } public static String getPrefSubtype(final InputMethodSubtype subtype) { |