nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 3afbac8c: Merge "[HW2] Have a script for hardware keyboard" 

* commit '3afbac8cb77bbe0ca8c4d54ad70489194349262e':
  [HW2] Have a script for hardware keyboard
main
Jean Chalard 2014-07-01 05:52:27 +00:00 committed by Android Git Automerger
parent 434cf23ec9 3afbac8cb7
commit 3ab0124289
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View File

@ -39,6 +39,7 @@ import com.android.inputmethod.latin.SubtypeSwitcher;
import com.android.inputmethod.latin.WordComposer; import com.android.inputmethod.latin.WordComposer;
import com.android.inputmethod.latin.settings.SettingsValues; import com.android.inputmethod.latin.settings.SettingsValues;
import com.android.inputmethod.latin.utils.ResourceUtils; import com.android.inputmethod.latin.utils.ResourceUtils;
import com.android.inputmethod.latin.utils.ScriptUtils;
public final class KeyboardSwitcher implements KeyboardState.SwitchActions { public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
private static final String TAG = KeyboardSwitcher.class.getSimpleName(); private static final String TAG = KeyboardSwitcher.class.getSimpleName();
@ -372,6 +373,9 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
} }
public int getCurrentKeyboardScriptId() { public int getCurrentKeyboardScriptId() {
if (null == mKeyboardLayoutSet) {
return ScriptUtils.SCRIPT_UNKNOWN;
}
return mKeyboardLayoutSet.getScriptId(); return mKeyboardLayoutSet.getScriptId();
} }
} }

4
java/src/com/android/inputmethod/latin/utils/ScriptUtils.java
View File

@ -23,6 +23,8 @@ import java.util.TreeMap;
* A class to help with handling different writing scripts. * A class to help with handling different writing scripts.
*/ */
public class ScriptUtils { public class ScriptUtils {
// Used for hardware keyboards
public static final int SCRIPT_UNKNOWN = -1;
// TODO: should we use ISO 15924 identifiers instead? // TODO: should we use ISO 15924 identifiers instead?
public static final int SCRIPT_LATIN = 0; public static final int SCRIPT_LATIN = 0;
public static final int SCRIPT_CYRILLIC = 1; public static final int SCRIPT_CYRILLIC = 1;
@ -89,6 +91,8 @@ public class ScriptUtils {
return (codePoint >= 0x370 && codePoint <= 0x3FF) return (codePoint >= 0x370 && codePoint <= 0x3FF)
|| (codePoint >= 0x1F00 && codePoint <= 0x1FFF) || (codePoint >= 0x1F00 && codePoint <= 0x1FFF)
|| codePoint == 0xF2; || codePoint == 0xF2;
case SCRIPT_UNKNOWN:
return true;
default: default:
// Should never come here // Should never come here
throw new RuntimeException("Impossible value of script: " + script); throw new RuntimeException("Impossible value of script: " + script);