aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2010-06-30 19:10:11 +0900
committerKen Wakasa <kwakasa@google.com>2010-06-30 19:10:11 +0900
commit67607ea8b12a149f95a5d74b94ff550eac4bd0ff (patch)
tree5daa6a434b4588f23882d8b4e745b563c8173949 /java
parent40c86618c1dab44ccb4fe1ae3e7eee88f4cfb998 (diff)
downloadlatinime-67607ea8b12a149f95a5d74b94ff550eac4bd0ff.tar.gz
latinime-67607ea8b12a149f95a5d74b94ff550eac4bd0ff.tar.xz
latinime-67607ea8b12a149f95a5d74b94ff550eac4bd0ff.zip
Fix "pi" input issues. Added a popup for greek capital pi. Bug: 2220892
Change-Id: Ie465e2ed93c79b0efe9d518cc44df1028f1bb392
Diffstat (limited to 'java')
-rwxr-xr-xjava/res/xml/kbd_symbols_shift.xml5
-rwxr-xr-xjava/res/xml/kbd_symbols_shift_black.xml5
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java4
3 files changed, 11 insertions, 3 deletions
diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml
index 09b5c3f9d..ca431fc8c 100755
--- a/java/res/xml/kbd_symbols_shift.xml
+++ b/java/res/xml/kbd_symbols_shift.xml
@@ -34,7 +34,10 @@
android:popupCharacters="♪♥♠♦♣"
/>
<Key android:keyLabel="√"/>
- <Key android:keyLabel="π"/>
+ <Key android:keyLabel="π"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Π"
+ />
<Key android:keyLabel="÷"/>
<Key android:keyLabel="×"/>
<Key android:keyLabel="{"/>
diff --git a/java/res/xml/kbd_symbols_shift_black.xml b/java/res/xml/kbd_symbols_shift_black.xml
index dc8425125..a8acb9d00 100755
--- a/java/res/xml/kbd_symbols_shift_black.xml
+++ b/java/res/xml/kbd_symbols_shift_black.xml
@@ -34,7 +34,10 @@
android:popupCharacters="♪♥♠♦♣"
/>
<Key android:keyLabel="√"/>
- <Key android:keyLabel="π"/>
+ <Key android:keyLabel="π"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Π"
+ />
<Key android:keyLabel="÷"/>
<Key android:keyLabel="×"/>
<Key android:keyLabel="{"/>
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index b863a708c..6af8c4f22 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1144,7 +1144,9 @@ public class LatinIME extends InputMethodService
}
}
if (mPredicting) {
- if (mKeyboardSwitcher.getInputView().isShifted() && mComposing.length() == 0) {
+ if (mKeyboardSwitcher.getInputView().isShifted()
+ && mKeyboardSwitcher.isAlphabetMode()
+ && mComposing.length() == 0) {
mWord.setCapitalized(true);
}
mComposing.append((char) primaryCode);