diff options
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | core/java/android/app/IStatusBarService.aidl (renamed from core/java/android/app/IStatusBar.aidl) | 2 | ||||
| -rw-r--r-- | core/java/android/app/StatusBarManager.java | 4 | ||||
| -rw-r--r-- | packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java | 6 | ||||
| -rwxr-xr-x | policy/com/android/internal/policy/impl/PhoneWindowManager.java | 6 | ||||
| -rw-r--r-- | services/java/com/android/server/status/StatusBarService.java | 8 |
6 files changed, 14 insertions, 14 deletions
@@ -86,7 +86,7 @@ LOCAL_SRC_FILES += \ core/java/android/app/ISearchManager.aidl \ core/java/android/app/ISearchManagerCallback.aidl \ core/java/android/app/IServiceConnection.aidl \ - core/java/android/app/IStatusBar.aidl \ + core/java/android/app/IStatusBarService.aidl \ core/java/android/app/IPoo.aidl \ core/java/android/app/IThumbnailReceiver.aidl \ core/java/android/app/ITransientNotification.aidl \ diff --git a/core/java/android/app/IStatusBar.aidl b/core/java/android/app/IStatusBarService.aidl index 696fffe..002f2a8 100644 --- a/core/java/android/app/IStatusBar.aidl +++ b/core/java/android/app/IStatusBarService.aidl @@ -19,7 +19,7 @@ package android.app; import android.app.IPoo; /** @hide */ -interface IStatusBar +interface IStatusBarService { void activate(); void deactivate(); diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 72ec616..746b2d5 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -58,12 +58,12 @@ public class StatusBarManager { public static final int DISABLE_NONE = 0x00000000; private Context mContext; - private IStatusBar mService; + private IStatusBarService mService; private IBinder mToken = new Binder(); StatusBarManager(Context context) { mContext = context; - mService = IStatusBar.Stub.asInterface( + mService = IStatusBarService.Stub.asInterface( ServiceManager.getService(Context.STATUS_BAR_SERVICE)); } diff --git a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java index d18fce7..b15ac0b 100644 --- a/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java +++ b/packages/StatusBarPhone/src/com/android/policy/statusbar/phone/StatusBarService.java @@ -17,7 +17,7 @@ package com.android.policy.statusbar.phone; import android.app.Service; -import android.app.IStatusBar; +import android.app.IStatusBarService; import android.app.IPoo; import android.content.Context; import android.content.Intent; @@ -38,7 +38,7 @@ public class StatusBarService extends Service { private static final String TAG = "StatusBarService"; Bar mBar = new Bar(); - IStatusBar mBarService; + IStatusBarService mBarService; @Override public void onCreate() { @@ -46,7 +46,7 @@ public class StatusBarService extends Service { addStatusBarView(); // Connect in to the status bar manager service - mBarService = IStatusBar.Stub.asInterface( + mBarService = IStatusBarService.Stub.asInterface( ServiceManager.getService(Context.STATUS_BAR_SERVICE)); try { mBarService.registerStatusBar(mBar); diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java index a7c278b..20c5edd 100755 --- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java @@ -19,7 +19,7 @@ package com.android.internal.policy.impl; import android.app.Activity; import android.app.ActivityManagerNative; import android.app.IActivityManager; -import android.app.IStatusBar; +import android.app.IStatusBarService; import android.app.IUiModeManager; import android.app.UiModeManager; import android.content.ActivityNotFoundException; @@ -1145,7 +1145,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { // this key doesn't exist on current hardware, but if a device // didn't have a touchscreen, it would want one of these to open // the status bar. - IStatusBar sbs = IStatusBar.Stub.asInterface(ServiceManager.getService("statusbar")); + IStatusBarService sbs = IStatusBarService.Stub.asInterface(ServiceManager.getService("statusbar")); if (sbs != null) { try { sbs.toggle(); @@ -1537,7 +1537,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } if (changes != 0 && hiding) { - IStatusBar sbs = IStatusBar.Stub.asInterface(ServiceManager.getService("statusbar")); + IStatusBarService sbs = IStatusBarService.Stub.asInterface(ServiceManager.getService("statusbar")); if (sbs != null) { try { // Make sure the window shade is hidden. diff --git a/services/java/com/android/server/status/StatusBarService.java b/services/java/com/android/server/status/StatusBarService.java index 1907c80..b4cab2c 100644 --- a/services/java/com/android/server/status/StatusBarService.java +++ b/services/java/com/android/server/status/StatusBarService.java @@ -21,7 +21,7 @@ import com.android.internal.util.CharSequences; import android.app.ActivityManagerNative; import android.app.Dialog; -import android.app.IStatusBar; +import android.app.IStatusBarService; import android.app.IPoo; import android.app.PendingIntent; import android.app.StatusBarManager; @@ -76,7 +76,7 @@ import java.util.Set; * are called from other classes just post a message, and everything else is batched * and coalesced into a series of calls to methods that all start with "perform." * There are two reasons for this. The first is that some of the methods (activate/deactivate) - * are on IStatusBar, so they're called from the thread pool and they need to make their + * are on IStatusBarService, so they're called from the thread pool and they need to make their * way onto the UI thread. The second is that the message queue is stopped while animations * are happening in order to make for smoother transitions. * <p> @@ -84,7 +84,7 @@ import java.util.Set; * separately throughout the code, although they both use the same key, which is assigned * when they are created. */ -public class StatusBarService extends IStatusBar.Stub +public class StatusBarService extends IStatusBarService.Stub { static final String TAG = "StatusBar"; static final boolean SPEW = false; @@ -360,7 +360,7 @@ public class StatusBarService extends IStatusBar.Stub } // ================================================================================ - // From IStatusBar + // From IStatusBarService // ================================================================================ public void activate() { enforceExpandStatusBar(); |