From 4032c24b7360e8d0ba5cd1e0e605cf3b7b1e3e29 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Mon, 1 Mar 2010 23:18:48 -0800
Subject: [PATCH] Fix 2414566 : Capitalizing first letter in unexpected fields.
Also move some symbols around as per yaks' request.
---
res/xml/kbd_symbols.xml | 2 +-
res/xml/popup_punctuation.xml | 18 +++++++++---------
.../android/inputmethod/latin/LatinIME.java | 1 +
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/res/xml/kbd_symbols.xml b/res/xml/kbd_symbols.xml
index 067932b3f0..ede7b50fc3 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 518e3f1f2c..a29fb520d5 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="&" />
<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=""" />
- <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=""" />
+ <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 4c81b33b1d..18b277c5a8 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);
--
GitLab