Merge "Insert into user dict with the correct locale" into ics-mr1

Author: Gilles Debunne

core/java/android/widget/TextView.java

@@ -9925,6 +9925,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
             if (suggestionInfo.suggestionIndex == ADD_TO_DICTIONARY) {
                 Intent intent = new Intent(Settings.ACTION_USER_DICTIONARY_INSERT);
                 intent.putExtra("word", originalText);
+                intent.putExtra("locale", getTextServicesLocale().toString());
                 intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
                 getContext().startActivity(intent);
                 // There is no way to know if the word was indeed added. Re-check.