luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-04 13:50:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable automatic shift for Georgian only

Browse source
This commit is contained in:
Alexander Pataridze 2020-04-23 19:39:16 +04:00
parent ab778a9bb9
commit a4d344e818
2 changed files with 60 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

108
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardLayoutSet.java
View file

@ -36,6 +36,7 @@ import org.dslul.openboard.inputmethod.keyboard.internal.UniqueKeysCache;
import org.dslul.openboard.inputmethod.latin.InputAttributes; import org.dslul.openboard.inputmethod.latin.InputAttributes;
import org.dslul.openboard.inputmethod.latin.R; import org.dslul.openboard.inputmethod.latin.R;
import org.dslul.openboard.inputmethod.latin.RichInputMethodSubtype; import org.dslul.openboard.inputmethod.latin.RichInputMethodSubtype;
import org.dslul.openboard.inputmethod.latin.common.StringUtils;
import org.dslul.openboard.inputmethod.latin.utils.InputTypeUtils; import org.dslul.openboard.inputmethod.latin.utils.InputTypeUtils;
import org.dslul.openboard.inputmethod.latin.utils.ScriptUtils; import org.dslul.openboard.inputmethod.latin.utils.ScriptUtils;
import org.dslul.openboard.inputmethod.latin.utils.SubtypeLocaleUtils; import org.dslul.openboard.inputmethod.latin.utils.SubtypeLocaleUtils;
@ -104,7 +105,9 @@ public final class KeyboardLayoutSet {
boolean mProximityCharsCorrectionEnabled; boolean mProximityCharsCorrectionEnabled;
boolean mSupportsSplitLayout; boolean mSupportsSplitLayout;
boolean mAllowRedundantMoreKeys; boolean mAllowRedundantMoreKeys;
public ElementParams() {}
public ElementParams() {
}
} }
public static final class Params { public static final class Params {
@ -147,7 +150,7 @@ public final class KeyboardLayoutSet {
} }
public static int getScriptId(final Resources resources, public static int getScriptId(final Resources resources,
@Nonnull final InputMethodSubtype subtype) { @Nonnull final InputMethodSubtype subtype) {
final Integer value = sScriptIdsForSubtypes.get(subtype); final Integer value = sScriptIdsForSubtypes.get(subtype);
if (null == value) { if (null == value) {
final int scriptId = Builder.readScriptId(resources, subtype); final int scriptId = Builder.readScriptId(resources, subtype);
@ -162,26 +165,28 @@ public final class KeyboardLayoutSet {
mParams = params; mParams = params;
} }
public static final String LOCALE_GEORGIAN = "ka";
@Nonnull @Nonnull
public Keyboard getKeyboard(final int baseKeyboardLayoutSetElementId) { public Keyboard getKeyboard(final int baseKeyboardLayoutSetElementId) {
final int keyboardLayoutSetElementId; int keyboardLayoutSetElementId;
switch (mParams.mMode) { switch (mParams.mMode) {
case KeyboardId.MODE_PHONE: case KeyboardId.MODE_PHONE:
if (baseKeyboardLayoutSetElementId == KeyboardId.ELEMENT_SYMBOLS) { if (baseKeyboardLayoutSetElementId == KeyboardId.ELEMENT_SYMBOLS) {
keyboardLayoutSetElementId = KeyboardId.ELEMENT_PHONE_SYMBOLS; keyboardLayoutSetElementId = KeyboardId.ELEMENT_PHONE_SYMBOLS;
} else { } else {
keyboardLayoutSetElementId = KeyboardId.ELEMENT_PHONE; keyboardLayoutSetElementId = KeyboardId.ELEMENT_PHONE;
} }
break; break;
case KeyboardId.MODE_NUMBER: case KeyboardId.MODE_NUMBER:
case KeyboardId.MODE_DATE: case KeyboardId.MODE_DATE:
case KeyboardId.MODE_TIME: case KeyboardId.MODE_TIME:
case KeyboardId.MODE_DATETIME: case KeyboardId.MODE_DATETIME:
keyboardLayoutSetElementId = KeyboardId.ELEMENT_NUMBER; keyboardLayoutSetElementId = KeyboardId.ELEMENT_NUMBER;
break; break;
default: default:
keyboardLayoutSetElementId = baseKeyboardLayoutSetElementId; keyboardLayoutSetElementId = baseKeyboardLayoutSetElementId;
break; break;
} }
ElementParams elementParams = mParams.mKeyboardLayoutSetElementIdToParamsMap.get( ElementParams elementParams = mParams.mKeyboardLayoutSetElementIdToParamsMap.get(
@ -197,6 +202,11 @@ public final class KeyboardLayoutSet {
mParams.mIsSplitLayoutEnabled = mParams.mIsSplitLayoutEnabledByUser mParams.mIsSplitLayoutEnabled = mParams.mIsSplitLayoutEnabledByUser
&& elementParams.mSupportsSplitLayout; && elementParams.mSupportsSplitLayout;
if (StringUtils.LANGUAGE_GEORGIAN.equals(mParams.mSubtype.getLocale().getLanguage()) && keyboardLayoutSetElementId == KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED) {
keyboardLayoutSetElementId = KeyboardId.ELEMENT_ALPHABET;
}
final KeyboardId id = new KeyboardId(keyboardLayoutSetElementId, mParams); final KeyboardId id = new KeyboardId(keyboardLayoutSetElementId, mParams);
try { try {
return getKeyboard(elementParams, id); return getKeyboard(elementParams, id);
@ -279,8 +289,7 @@ public final class KeyboardLayoutSet {
// be locked down. // be locked down.
// TODO: Switch to {@code UserManagerCompat.isUserUnlocked()} in the support-v4 library // TODO: Switch to {@code UserManagerCompat.isUserUnlocked()} in the support-v4 library
// when it becomes publicly available. // when it becomes publicly available.
@UserManagerCompatUtils.LockState @UserManagerCompatUtils.LockState final int lockState = UserManagerCompatUtils.getUserLockState(context);
final int lockState = UserManagerCompatUtils.getUserLockState(context);
if (lockState == UserManagerCompatUtils.LOCK_STATE_LOCKED) { if (lockState == UserManagerCompatUtils.LOCK_STATE_LOCKED) {
params.mNoSettingsKey = true; params.mNoSettingsKey = true;
} }
@ -295,8 +304,7 @@ public final class KeyboardLayoutSet {
public Builder setSubtype(@Nonnull final RichInputMethodSubtype subtype) { public Builder setSubtype(@Nonnull final RichInputMethodSubtype subtype) {
final boolean asciiCapable = subtype.getmSubtype().isAsciiCapable(); final boolean asciiCapable = subtype.getmSubtype().isAsciiCapable();
// TODO: Consolidate with {@link InputAttributes}. // TODO: Consolidate with {@link InputAttributes}.
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation") final boolean deprecatedForceAscii = InputAttributes.inPrivateImeOptions(
final boolean deprecatedForceAscii = InputAttributes.inPrivateImeOptions(
mPackageName, FORCE_ASCII, mParams.mEditorInfo); mPackageName, FORCE_ASCII, mParams.mEditorInfo);
final boolean forceAscii = EditorInfoCompatUtils.hasFlagForceAscii( final boolean forceAscii = EditorInfoCompatUtils.hasFlagForceAscii(
mParams.mEditorInfo.imeOptions) mParams.mEditorInfo.imeOptions)
@ -361,7 +369,7 @@ public final class KeyboardLayoutSet {
} }
private static int readScriptIdFromTagFeature(final Resources resources, private static int readScriptIdFromTagFeature(final Resources resources,
final XmlPullParser parser) throws IOException, XmlPullParserException { final XmlPullParser parser) throws IOException, XmlPullParserException {
final TypedArray featureAttr = resources.obtainAttributes(Xml.asAttributeSet(parser), final TypedArray featureAttr = resources.obtainAttributes(Xml.asAttributeSet(parser),
R.styleable.KeyboardLayoutSet_Feature); R.styleable.KeyboardLayoutSet_Feature);
try { try {
@ -473,33 +481,33 @@ public final class KeyboardLayoutSet {
final int variation = inputType & InputType.TYPE_MASK_VARIATION; final int variation = inputType & InputType.TYPE_MASK_VARIATION;
switch (inputType & InputType.TYPE_MASK_CLASS) { switch (inputType & InputType.TYPE_MASK_CLASS) {
case InputType.TYPE_CLASS_NUMBER: case InputType.TYPE_CLASS_NUMBER:
return KeyboardId.MODE_NUMBER; return KeyboardId.MODE_NUMBER;
case InputType.TYPE_CLASS_DATETIME: case InputType.TYPE_CLASS_DATETIME:
switch (variation) { switch (variation) {
case InputType.TYPE_DATETIME_VARIATION_DATE: case InputType.TYPE_DATETIME_VARIATION_DATE:
return KeyboardId.MODE_DATE; return KeyboardId.MODE_DATE;
case InputType.TYPE_DATETIME_VARIATION_TIME: case InputType.TYPE_DATETIME_VARIATION_TIME:
return KeyboardId.MODE_TIME; return KeyboardId.MODE_TIME;
default: // InputType.TYPE_DATETIME_VARIATION_NORMAL default: // InputType.TYPE_DATETIME_VARIATION_NORMAL
return KeyboardId.MODE_DATETIME; return KeyboardId.MODE_DATETIME;
} }
case InputType.TYPE_CLASS_PHONE: case InputType.TYPE_CLASS_PHONE:
return KeyboardId.MODE_PHONE; return KeyboardId.MODE_PHONE;
case InputType.TYPE_CLASS_TEXT: case InputType.TYPE_CLASS_TEXT:
if (InputTypeUtils.isEmailVariation(variation)) { if (InputTypeUtils.isEmailVariation(variation)) {
return KeyboardId.MODE_EMAIL; return KeyboardId.MODE_EMAIL;
} else if (variation == InputType.TYPE_TEXT_VARIATION_URI) { } else if (variation == InputType.TYPE_TEXT_VARIATION_URI) {
return KeyboardId.MODE_URL; return KeyboardId.MODE_URL;
} else if (variation == InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE) { } else if (variation == InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE) {
return KeyboardId.MODE_IM; return KeyboardId.MODE_IM;
} else if (variation == InputType.TYPE_TEXT_VARIATION_FILTER) { } else if (variation == InputType.TYPE_TEXT_VARIATION_FILTER) {
return KeyboardId.MODE_TEXT;
} else {
return KeyboardId.MODE_TEXT;
}
default:
return KeyboardId.MODE_TEXT; return KeyboardId.MODE_TEXT;
} else {
return KeyboardId.MODE_TEXT;
}
default:
return KeyboardId.MODE_TEXT;
} }
} }
} }

3
app/src/main/java/org/dslul/openboard/inputmethod/latin/common/StringUtils.java
View file

@ -26,6 +26,8 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public final class StringUtils { public final class StringUtils {
public static final String LANGUAGE_GEORGIAN = "ka";
public static final int CAPITALIZE_NONE = 0; // No caps, or mixed case public static final int CAPITALIZE_NONE = 0; // No caps, or mixed case
public static final int CAPITALIZE_FIRST = 1; // First only public static final int CAPITALIZE_FIRST = 1; // First only
public static final int CAPITALIZE_ALL = 2; // All caps public static final int CAPITALIZE_ALL = 2; // All caps
@ -583,7 +585,6 @@ public final class StringUtils {
} }
private static final String LANGUAGE_GREEK = "el"; private static final String LANGUAGE_GREEK = "el";
private static final String LANGUAGE_GEORGIAN = "ka";
@Nonnull @Nonnull
private static Locale getLocaleUsedForToTitleCase(@Nonnull final Locale locale) { private static Locale getLocaleUsedForToTitleCase(@Nonnull final Locale locale) {