aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/res/raw/main_de.dictbin0 -> 1605716 bytes
-rw-r--r--java/res/raw/main_en.dictbin0 -> 1069228 bytes
-rw-r--r--java/res/raw/main_es.dictbin0 -> 1138868 bytes
-rw-r--r--java/res/raw/main_fr.dictbin0 -> 1330249 bytes
-rw-r--r--java/res/raw/main_it.dictbin0 -> 1143332 bytes
-rw-r--r--java/res/values-en/whitelist.xml4
-rw-r--r--java/res/values/config.xml4
-rw-r--r--java/res/xml-sw600dp/keys_f1f2.xml2
-rw-r--r--java/res/xml-sw600dp/rows_number_password.xml26
-rw-r--r--java/res/xml/method.xml11
-rw-r--r--java/res/xml/rows_number_password.xml32
-rw-r--r--java/src/com/android/inputmethod/keyboard/Keyboard.java14
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardView.java3
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java5
14 files changed, 75 insertions, 26 deletions
diff --git a/java/res/raw/main_de.dict b/java/res/raw/main_de.dict
new file mode 100644
index 000000000..68b0dceb2
--- /dev/null
+++ b/java/res/raw/main_de.dict
Binary files differ
diff --git a/java/res/raw/main_en.dict b/java/res/raw/main_en.dict
new file mode 100644
index 000000000..2cfa35168
--- /dev/null
+++ b/java/res/raw/main_en.dict
Binary files differ
diff --git a/java/res/raw/main_es.dict b/java/res/raw/main_es.dict
new file mode 100644
index 000000000..8321c70f8
--- /dev/null
+++ b/java/res/raw/main_es.dict
Binary files differ
diff --git a/java/res/raw/main_fr.dict b/java/res/raw/main_fr.dict
new file mode 100644
index 000000000..cfa9f473d
--- /dev/null
+++ b/java/res/raw/main_fr.dict
Binary files differ
diff --git a/java/res/raw/main_it.dict b/java/res/raw/main_it.dict
new file mode 100644
index 000000000..ed260f2a2
--- /dev/null
+++ b/java/res/raw/main_it.dict
Binary files differ
diff --git a/java/res/values-en/whitelist.xml b/java/res/values-en/whitelist.xml
index 9c1085883..bcb884e1d 100644
--- a/java/res/values-en/whitelist.xml
+++ b/java/res/values-en/whitelist.xml
@@ -434,6 +434,10 @@
<item>makes</item>
<item>255</item>
+ <item>moat</item>
+ <item>most</item>
+
+ <item>255</item>
<item>monday</item>
<item>Monday</item>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 21010b3c2..d5268ea5f 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -74,9 +74,9 @@
<item></item>
<!-- Modest : Suggestion whose normalized score is greater than this value
will be subject to auto-correction. -->
- <item>0.22</item>
+ <item>0.185</item>
<!-- Aggressive -->
- <item>0.08</item>
+ <item>0.067</item>
<!-- Very Aggressive : Suggestion whose normalized score is greater than this value
will be subject to auto-correction. -->
<item>0</item>
diff --git a/java/res/xml-sw600dp/keys_f1f2.xml b/java/res/xml-sw600dp/keys_f1f2.xml
index 9d2968720..721bfc722 100644
--- a/java/res/xml-sw600dp/keys_f1f2.xml
+++ b/java/res/xml-sw600dp/keys_f1f2.xml
@@ -27,7 +27,7 @@
>
<Key
latin:keyStyle="comKeyStyle"
- latin:keyWidth="17.0%p" />
+ latin:keyWidth="18.0%p" />
</case>
<default>
<switch>
diff --git a/java/res/xml-sw600dp/rows_number_password.xml b/java/res/xml-sw600dp/rows_number_password.xml
index 36f4bba46..6c3855a01 100644
--- a/java/res/xml-sw600dp/rows_number_password.xml
+++ b/java/res/xml-sw600dp/rows_number_password.xml
@@ -31,9 +31,8 @@
latin:keyStyle="num2KeyStyle" />
<Key
latin:keyStyle="num3KeyStyle" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyXPos="-16%p"
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
latin:keyWidth="fillRight" />
</Row>
<Row>
@@ -46,9 +45,8 @@
latin:keyStyle="num5KeyStyle" />
<Key
latin:keyStyle="num6KeyStyle" />
- <Key
- latin:keyStyle="enterKeyStyle"
- latin:keyXPos="-16%p"
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
latin:keyWidth="fillRight" />
</Row>
<Row>
@@ -62,17 +60,21 @@
<Key
latin:keyStyle="num9KeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
- <Spacer />
+ <Spacer
+ latin:keyWidth="fillRight" />
</Row>
<Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
- latin:keyWidth="41%p" />
+ latin:keyWidth="23%p" />
+ <Key
+ latin:keyStyle="deleteKeyStyle" />
<Key
latin:keyStyle="num0KeyStyle" />
- <include
- latin:keyXPos="-10%p"
- latin:keyWidth="fillRight"
- latin:keyboardLayout="@xml/key_shortcut" />
+ <Key
+ latin:keyStyle="enterKeyStyle" />
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
+ latin:keyWidth="fillRight" />
</Row>
</merge>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 19b32f2e7..a0262846b 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -52,7 +52,8 @@
nb: Norwaian Bokmål/nordic
nl: Dutch/qwerty
pl: Polish/qwerty
- pt: Portuguese/qwerty
+ pt_BR: Portuguese Brazil/qwerty
+ pt_PT: Portuguese Portugal/qwerty
ro: Romanian/qwerty
ru: Russian/east_slavic
sk: Slovak/qwerty
@@ -254,7 +255,13 @@
/>
<subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic"
- android:imeSubtypeLocale="pt"
+ android:imeSubtypeLocale="pt_BR"
+ android:imeSubtypeMode="keyboard"
+ android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
+ />
+ <subtype android:icon="@drawable/ic_subtype_keyboard"
+ android:label="@string/subtype_generic"
+ android:imeSubtypeLocale="pt_PT"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
/>
diff --git a/java/res/xml/rows_number_password.xml b/java/res/xml/rows_number_password.xml
index e4272ed3f..2e61a08ae 100644
--- a/java/res/xml/rows_number_password.xml
+++ b/java/res/xml/rows_number_password.xml
@@ -22,41 +22,59 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="10%p" />
<Key
latin:keyStyle="num1KeyStyle" />
<Key
latin:keyStyle="num2KeyStyle" />
<Key
latin:keyStyle="num3KeyStyle" />
- <Spacer />
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
+ latin:keyWidth="fillRight" />
</Row>
<Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="10%p" />
<Key
latin:keyStyle="num4KeyStyle" />
<Key
latin:keyStyle="num5KeyStyle" />
<Key
latin:keyStyle="num6KeyStyle" />
- <Spacer />
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
+ latin:keyWidth="fillRight" />
</Row>
<Row>
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="10%p" />
<Key
latin:keyStyle="num7KeyStyle" />
<Key
latin:keyStyle="num8KeyStyle" />
<Key
latin:keyStyle="num9KeyStyle" />
- <Key
- latin:keyStyle="deleteKeyStyle"
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
latin:keyWidth="fillRight" />
</Row>
<Row>
- <Spacer />
+ <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+ <Spacer
+ latin:keyWidth="10%p" />
+ <Key
+ latin:keyStyle="deleteKeyStyle" />
<Key
latin:keyStyle="num0KeyStyle" />
- <Spacer />
<Key
- latin:keyStyle="enterKeyStyle"
+ latin:keyStyle="enterKeyStyle" />
+ <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
+ <Spacer
latin:keyWidth="fillRight" />
</Row>
</merge>
diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java
index bd3b0e114..0be4cf3a7 100644
--- a/java/src/com/android/inputmethod/keyboard/Keyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java
@@ -197,6 +197,20 @@ public class Keyboard {
return null;
}
+ public boolean hasKey(Key aKey) {
+ if (mKeyCache.containsKey(aKey)) {
+ return true;
+ }
+
+ for (final Key key : mKeys) {
+ if (key == aKey) {
+ mKeyCache.put(key.mCode, key);
+ return true;
+ }
+ }
+ return false;
+ }
+
public static boolean isLetterCode(int code) {
return code >= MINIMUM_LETTER_CODE;
}
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index c0d5b6772..cc0a1fb10 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -487,6 +487,9 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
} else {
// Draw invalidated keys.
for (final Key key : mInvalidatedKeys) {
+ if (!mKeyboard.hasKey(key)) {
+ continue;
+ }
final int x = key.mX + getPaddingLeft();
final int y = key.mY + getPaddingTop();
mInvalidatedKeysRect.set(x, y, x + key.mWidth, y + key.mHeight);
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index b59e939b7..261755f53 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1298,8 +1298,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
break;
}
switcher.onCodeInput(primaryCode);
- // Reset after any single keystroke
- if (!didAutoCorrect)
+ // Reset after any single keystroke, except shift and symbol-shift
+ if (!didAutoCorrect && primaryCode != Keyboard.CODE_SHIFT
+ && primaryCode != Keyboard.CODE_SWITCH_ALPHA_SYMBOL)
mLastComposedWord.deactivate();
mEnteredText = null;
}
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-05-05 14:35:46 +0000