Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cd96129 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

Merge "Fix ime swtich issue" into jb-mr1-dev

parents 08874db8 d08a9238

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

+1 −1
Original line number Diff line number Diff line
@@ -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

+3 −0
Original line number Diff line number Diff line
@@ -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;