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

Commit 44e43d1f authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp 

Change-Id: Id6bd5ab1d6eda0372f2fd8eecb8f1d204066c4d5
parents a6c28cb0 efcac2ff

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

+3 −3
Original line number Diff line number Diff line
@@ -466,6 +466,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        screenOnOffFilt.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);

        mContext.registerReceiver(new ScreenOnOffReceiver(), screenOnOffFilt);



        mStatusBar = statusBar;

        statusBar.setIconVisibility("ime", false);



        buildInputMethodListLocked(mMethodList, mMethodMap);



        final String enabledStr = Settings.Secure.getString(
@@ -507,9 +510,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            }

        }



        mStatusBar = statusBar;

        statusBar.setIconVisibility("ime", false);



        mSettingsObserver = new SettingsObserver(mHandler);

        updateFromSettingsLocked();

    }