am 63e07676: Merge "Add RichInputMethodSubtype.getKeyboardLayoutSetName"
* commit '63e076764b6f5c5deb0c43b9f8128bee6725edc8': Add RichInputMethodSubtype.getKeyboardLayoutSetNamemain
commit
290fa36253
|
@ -294,7 +294,7 @@ public final class KeyboardLayoutSet {
|
||||||
: subtype;
|
: subtype;
|
||||||
mParams.mSubtype = keyboardSubtype;
|
mParams.mSubtype = keyboardSubtype;
|
||||||
mParams.mKeyboardLayoutSetName = KEYBOARD_LAYOUT_SET_RESOURCE_PREFIX
|
mParams.mKeyboardLayoutSetName = KEYBOARD_LAYOUT_SET_RESOURCE_PREFIX
|
||||||
+ SubtypeLocaleUtils.getKeyboardLayoutSetName(keyboardSubtype);
|
+ keyboardSubtype.getKeyboardLayoutSetName();
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -648,7 +648,7 @@ public class KeyboardBuilder<KP extends KeyboardParams> {
|
||||||
try {
|
try {
|
||||||
final boolean keyboardLayoutSetMatched = matchString(caseAttr,
|
final boolean keyboardLayoutSetMatched = matchString(caseAttr,
|
||||||
R.styleable.Keyboard_Case_keyboardLayoutSet,
|
R.styleable.Keyboard_Case_keyboardLayoutSet,
|
||||||
SubtypeLocaleUtils.getKeyboardLayoutSetName(id.mSubtype));
|
id.mSubtype.getKeyboardLayoutSetName());
|
||||||
final boolean keyboardLayoutSetElementMatched = matchTypedValue(caseAttr,
|
final boolean keyboardLayoutSetElementMatched = matchTypedValue(caseAttr,
|
||||||
R.styleable.Keyboard_Case_keyboardLayoutSetElement, id.mElementId,
|
R.styleable.Keyboard_Case_keyboardLayoutSetElement, id.mElementId,
|
||||||
KeyboardId.elementIdToName(id.mElementId));
|
KeyboardId.elementIdToName(id.mElementId));
|
||||||
|
|
|
@ -52,7 +52,7 @@ public final class LanguageOnSpacebarHelper {
|
||||||
return FORMAT_TYPE_MULTIPLE;
|
return FORMAT_TYPE_MULTIPLE;
|
||||||
}
|
}
|
||||||
final String keyboardLanguage = locales[0].getLanguage();
|
final String keyboardLanguage = locales[0].getLanguage();
|
||||||
final String keyboardLayout = SubtypeLocaleUtils.getKeyboardLayoutSetName(subtype);
|
final String keyboardLayout = subtype.getKeyboardLayoutSetName();
|
||||||
int sameLanguageAndLayoutCount = 0;
|
int sameLanguageAndLayoutCount = 0;
|
||||||
for (final InputMethodSubtype ims : mEnabledSubtypes) {
|
for (final InputMethodSubtype ims : mEnabledSubtypes) {
|
||||||
final String language = SubtypeLocaleUtils.getSubtypeLocale(ims).getLanguage();
|
final String language = SubtypeLocaleUtils.getSubtypeLocale(ims).getLanguage();
|
||||||
|
|
|
@ -142,6 +142,11 @@ public final class RichInputMethodSubtype {
|
||||||
@Nonnull
|
@Nonnull
|
||||||
public InputMethodSubtype getRawSubtype() { return mSubtype; }
|
public InputMethodSubtype getRawSubtype() { return mSubtype; }
|
||||||
|
|
||||||
|
@Nonnull
|
||||||
|
public String getKeyboardLayoutSetName() {
|
||||||
|
return SubtypeLocaleUtils.getKeyboardLayoutSetName(mSubtype);
|
||||||
|
}
|
||||||
|
|
||||||
// Dummy no language QWERTY subtype. See {@link R.xml.method}.
|
// Dummy no language QWERTY subtype. See {@link R.xml.method}.
|
||||||
private static final int SUBTYPE_ID_OF_DUMMY_NO_LANGUAGE_SUBTYPE = 0xdde0bfd3;
|
private static final int SUBTYPE_ID_OF_DUMMY_NO_LANGUAGE_SUBTYPE = 0xdde0bfd3;
|
||||||
private static final String EXTRA_VALUE_OF_DUMMY_NO_LANGUAGE_SUBTYPE =
|
private static final String EXTRA_VALUE_OF_DUMMY_NO_LANGUAGE_SUBTYPE =
|
||||||
|
|
|
@ -328,10 +328,6 @@ public final class SubtypeLocaleUtils {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nonnull
|
@Nonnull
|
||||||
public static String getKeyboardLayoutSetName(@Nonnull final RichInputMethodSubtype subtype) {
|
|
||||||
return getKeyboardLayoutSetName(subtype.getRawSubtype());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getKeyboardLayoutSetName(final InputMethodSubtype subtype) {
|
public static String getKeyboardLayoutSetName(final InputMethodSubtype subtype) {
|
||||||
String keyboardLayoutSet = subtype.getExtraValueOf(KEYBOARD_LAYOUT_SET);
|
String keyboardLayoutSet = subtype.getExtraValueOf(KEYBOARD_LAYOUT_SET);
|
||||||
if (keyboardLayoutSet == null) {
|
if (keyboardLayoutSet == null) {
|
||||||
|
|
Loading…
Reference in New Issue