diff options
| author | 2016-03-11 09:02:21 +0000 | |
|---|---|---|
| committer | 2016-03-11 09:02:22 +0000 | |
| commit | 607c0a0a09e6543609f70eb27cc06ff44857252e (patch) | |
| tree | 6623eaf682f78483c4dbaa2415a5d0e7eb88afbd | |
| parent | 262a8f2a0f1d1d8e0ea3401d4b3d91a36b0754df (diff) | |
| parent | 1e1a447000263151822b67a4981cd854fa8cb3c5 (diff) | |
Merge "Persist isAsciiCapable attribute of additional subtypes." into nyc-dev
| -rw-r--r-- | services/core/java/com/android/server/InputMethodManagerService.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index a93b4d8bc250..9b8f2d2d7d57 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -3588,6 +3588,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub private static final String ATTR_IME_SUBTYPE_MODE = "imeSubtypeMode"; private static final String ATTR_IME_SUBTYPE_EXTRA_VALUE = "imeSubtypeExtraValue"; private static final String ATTR_IS_AUXILIARY = "isAuxiliary"; + private static final String ATTR_IS_ASCII_CAPABLE = "isAsciiCapable"; private final AtomicFile mAdditionalInputMethodSubtypeFile; private final HashMap<String, InputMethodInfo> mMethodMap; private final HashMap<String, List<InputMethodSubtype>> mAdditionalSubtypesMap = @@ -3684,6 +3685,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub out.attribute(null, ATTR_IME_SUBTYPE_EXTRA_VALUE, subtype.getExtraValue()); out.attribute(null, ATTR_IS_AUXILIARY, String.valueOf(subtype.isAuxiliary() ? 1 : 0)); + out.attribute(null, ATTR_IS_ASCII_CAPABLE, + String.valueOf(subtype.isAsciiCapable() ? 1 : 0)); out.endTag(null, NODE_SUBTYPE); } out.endTag(null, NODE_IMI); @@ -3749,6 +3752,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub parser.getAttributeValue(null, ATTR_IME_SUBTYPE_EXTRA_VALUE); final boolean isAuxiliary = "1".equals(String.valueOf( parser.getAttributeValue(null, ATTR_IS_AUXILIARY))); + final boolean isAsciiCapable = "1".equals(String.valueOf( + parser.getAttributeValue(null, ATTR_IS_ASCII_CAPABLE))); final InputMethodSubtype subtype = new InputMethodSubtypeBuilder() .setSubtypeNameResId(label) .setSubtypeIconResId(icon) @@ -3757,6 +3762,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub .setSubtypeMode(imeSubtypeMode) .setSubtypeExtraValue(imeSubtypeExtraValue) .setIsAuxiliary(isAuxiliary) + .setIsAsciiCapable(isAsciiCapable) .build(); tempSubtypesArray.add(subtype); } |