am 3cd96129: Merge "Fix ime swtich issue" into jb-mr1-dev

* commit '3cd961292e877cc5fac146290421e9e67aa553a2':
  Fix ime swtich issue

core/res/res/values-sw600dp/bools.xml

@@ -16,5 +16,5 @@
 
 <resources>
     <bool name="target_honeycomb_needs_options_menu">false</bool>
-    <bool name="show_ongoing_ime_switcher">false</bool>
+    <bool name="show_ongoing_ime_switcher">true</bool>
 </resources>

services/java/com/android/server/InputMethodManagerService.java

@@ -745,6 +745,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
                     // set the current ime to the proper one.
                     resetDefaultImeLocked(mContext);
                 }
+            } else {
+                // If the locale is changed, needs to reset the default ime
+                resetDefaultImeLocked(mContext);
             }
             updateFromSettingsLocked();
             mLastSystemLocale = newLocale;