Rename IStatusBar to IStatusBarService.

Change-Id: Icfec2a830f037b21f6afaa796bf49da610567e7b

Android.mk

@@ -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 \

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();

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));
     }
 

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);

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.

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();