diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-11 11:51:31 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-11 11:51:31 -0700 |
| commit | 44e43d1f6593ae912b3818692058196233cd4ac9 (patch) | |
| tree | e67a660f2f1ec8cc00f5717f767029cbddcd7f54 /services/java | |
| parent | a6c28cb014c32b9522c41385075c9db77296f6e7 (diff) | |
| parent | efcac2ffba6262829093c4388c35f93b0ba0510e (diff) | |
| download | frameworks_base-44e43d1f6593ae912b3818692058196233cd4ac9.zip frameworks_base-44e43d1f6593ae912b3818692058196233cd4ac9.tar.gz frameworks_base-44e43d1f6593ae912b3818692058196233cd4ac9.tar.bz2 | |
resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp
Change-Id: Id6bd5ab1d6eda0372f2fd8eecb8f1d204066c4d5
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 710d817..2e33cf1 100644 --- 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(); } |