Merge pull request #1112 from keymanapp/android-sil-euro-latin

[Android] Change default keyboard from european2 to sil_euro_latin
This commit is contained in:
Darcy Wong 2018-08-22 20:36:12 +07:00 • committed by GitHub
commit 2df968c2a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 114 additions and 113 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -130,9 +130,9 @@ public final class KMManager {
public static final String KMDefault_AssetPackages = "packages";
// Default Keyboard Info
public static final String KMDefault_KeyboardID = "european2";
public static final String KMDefault_KeyboardID = "sil_euro_latin";
public static final String KMDefault_LanguageID = "en";
public static final String KMDefault_KeyboardName = "EuroLatin2 Keyboard";
public static final String KMDefault_KeyboardName = "EuroLatin (SIL) Keyboard";
public static final String KMDefault_LanguageName = "English";
public static final String KMDefault_KeyboardFont = "{\"family\":\"LatinWeb\",\"source\":[\"DejaVuSans.ttf\"]}";
@ -524,7 +524,7 @@ public final class KMManager {
boolean shouldClearCache = false;
HashMap<String, String> kbInfo = kbList.get(0);
String kbID = kbInfo.get(KMKey_KeyboardID);
if (kbID.equals("us")) {
if (kbID.equals("us") || (kbID.equals("european2"))) {
HashMap<String, String> newKbInfo = new HashMap<String, String>();
newKbInfo.put(KMManager.KMKey_PackageID, KMManager.KMDefault_UndefinedPackageID);
newKbInfo.put(KMManager.KMKey_KeyboardID, KMManager.KMDefault_KeyboardID);

View file

@ -4,6 +4,7 @@
## 11.0 alpha
* Move to 11.0
* Add round launcher icons
* Change default keyboard from `european` to `sil_euro_latin` (#1112)
## 2018-08-16 10.0.503 stable
* Fixes crashes for release configurations when InputConfiguration or package name is null (#1103)