diff options
| author | 2012-09-28 00:26:54 -0700 | |
|---|---|---|
| committer | 2012-09-28 00:26:55 -0700 | |
| commit | 3cd961292e877cc5fac146290421e9e67aa553a2 (patch) | |
| tree | 79604ec126778a6cefab6209a348ee9c5e560532 | |
| parent | 08874db8ed9f81f1d0f205bbffe87f913e50bc57 (diff) | |
| parent | d08a9238db0de62c956788ceebb227d099ad88c2 (diff) | |
Merge "Fix ime swtich issue" into jb-mr1-dev
| -rw-r--r-- | core/res/res/values-sw600dp/bools.xml | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/res/res/values-sw600dp/bools.xml b/core/res/res/values-sw600dp/bools.xml index 751b99766698..2f65eabaa9f1 100644 --- a/core/res/res/values-sw600dp/bools.xml +++ b/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> diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 0f2bb206520f..ec58e4378692 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/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; |