Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 201fc70..f5e2441 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -422,11 +422,11 @@
<!-- Title of an option for usability study mode -->
<string name="prefs_usability_study_mode">Usability study mode</string>
- <!-- Title of the settings for key long press delay [CHAR LIMIT=30] -->
+ <!-- Title of the settings for key long press delay [CHAR LIMIT=35] -->
<string name="prefs_key_longpress_timeout_settings">Key long press delay</string>
- <!-- Title of the settings for keypress vibration duration [CHAR LIMIT=30] -->
+ <!-- Title of the settings for keypress vibration duration [CHAR LIMIT=35] -->
<string name="prefs_keypress_vibration_duration_settings">Keypress vibration duration</string>
- <!-- Title of the settings for keypress sound volume [CHAR LIMIT=30] -->
+ <!-- Title of the settings for keypress sound volume [CHAR LIMIT=35] -->
<string name="prefs_keypress_sound_volume_settings">Keypress sound volume</string>
<!-- Title of the settings for reading an external dictionary file -->
<string name="prefs_read_external_dictionary">Read external dictionary file</string>
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 4db0a90..bf4c22d 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -161,8 +161,7 @@
mPositionalInfoForUserDictPendingAddition = null;
private final WordComposer mWordComposer = new WordComposer();
private final RichInputConnection mConnection = new RichInputConnection(this);
- private RecapitalizeStatus mRecapitalizeStatus = new RecapitalizeStatus(-1, -1, "",
- Locale.getDefault(), ""); // Dummy object that will match no real recapitalize
+ private RecapitalizeStatus mRecapitalizeStatus = null;
// Keep track of the last selection range to decide if we need to show word alternatives
private static final int NOT_A_CURSOR_POSITION = -1;
@@ -925,7 +924,8 @@
// We moved the cursor. If we are touching a word, we need to resume suggestion.
mHandler.postResumeSuggestions();
-
+ // Reset the last recapitalization.
+ mRecapitalizeStatus = null;
mKeyboardSwitcher.updateShiftState();
}
mExpectingUpdateSelection = false;