aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xres/xml/kbd_symbols.xml2
-rw-r--r--res/xml/popup_punctuation.xml18
-rw-r--r--src/com/android/inputmethod/latin/LatinIME.java1
3 files changed, 11 insertions, 10 deletions
diff --git a/res/xml/kbd_symbols.xml b/res/xml/kbd_symbols.xml
index 067932b3f..ede7b50fc 100755
--- a/res/xml/kbd_symbols.xml
+++ b/res/xml/kbd_symbols.xml
@@ -77,7 +77,7 @@
/>
<Key android:codes="45" android:keyLabel="-"
android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="–—"
+ android:popupCharacters="_–—"
/>
<Key android:keyLabel="+"
android:popupKeyboard="@xml/kbd_popup_template"
diff --git a/res/xml/popup_punctuation.xml b/res/xml/popup_punctuation.xml
index 518e3f1f2..a29fb520d 100644
--- a/res/xml/popup_punctuation.xml
+++ b/res/xml/popup_punctuation.xml
@@ -26,8 +26,8 @@
>
<Row android:rowEdgeFlags="top">
- <Key android:keyLabel=";" android:keyEdgeFlags="left" />
- <Key android:keyLabel="," />
+ <Key android:keyLabel=":" android:keyEdgeFlags="left" />
+ <Key android:keyLabel="/" />
<Key android:keyLabel="&amp;" />
<Key android:keyLabel="(" />
<Key android:keyLabel=")" />
@@ -35,12 +35,12 @@
<Key android:keyLabel="+" android:keyEdgeFlags="right" />
</Row>
<Row android:rowEdgeFlags="bottom">
- <Key android:codes="58" android:keyLabel=":" android:keyEdgeFlags="left" />
- <Key android:codes="47" android:keyLabel="/" />
- <Key android:codes="64" android:keyLabel="\@" />
- <Key android:codes="39" android:keyLabel="\'" />
- <Key android:codes="34" android:keyLabel="&quot;" />
- <Key android:codes="63" android:keyLabel="\?" />
- <Key android:codes="33" android:keyLabel="!" android:keyEdgeFlags="right" />
+ <Key android:keyLabel=";" android:keyEdgeFlags="left" />
+ <Key android:keyLabel="," />
+ <Key android:keyLabel="\@" />
+ <Key android:keyLabel="\'" />
+ <Key android:keyLabel="&quot;" />
+ <Key android:keyLabel="\?" />
+ <Key android:keyLabel="!" android:keyEdgeFlags="right" />
</Row>
</Keyboard>
diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java
index 4c81b33b1..18b277c5a 100644
--- a/src/com/android/inputmethod/latin/LatinIME.java
+++ b/src/com/android/inputmethod/latin/LatinIME.java
@@ -534,6 +534,7 @@ public class LatinIME extends InputMethodService
mDeleteCount = 0;
mJustAddedAutoSpace = false;
loadSettings();
+ updateShiftKeyState(attribute);
setCandidatesViewShown(false);
setSuggestions(null, false, false, false);