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

Change-Id: Id6bd5ab1d6eda0372f2fd8eecb8f1d204066c4d5
2010-08-11 11:51:31 -07:00
parent a6c28cb014 efcac2ffba
commit 44e43d1f65
1 changed files with 3 additions and 3 deletions
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -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();
    }