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

Commit 0cbda99f authored by Joe Onorato's avatar Joe Onorato
Browse files

The status bar draws its icons now.

parent 503007dd

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ 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/IThumbnailReceiver.aidl \

	core/java/android/app/ITransientNotification.aidl \

	core/java/android/app/IUiModeManager.aidl \
@@ -156,6 +154,8 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/backup/IBackupTransport.aidl \

	core/java/com/android/internal/os/IDropBoxManagerService.aidl \

	core/java/com/android/internal/os/IResultReceiver.aidl \

	core/java/com/android/internal/statusbar/IStatusBar.aidl \

	core/java/com/android/internal/statusbar/IStatusBarService.aidl \

	core/java/com/android/internal/view/IInputContext.aidl \

	core/java/com/android/internal/view/IInputContextCallback.aidl \

	core/java/com/android/internal/view/IInputMethod.aidl \

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/FrameworkTest_intermediates/)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android.policy*)

$(call add-clean-step, rm -rf $(TARGET_OUT_JAVA_LIBRARIES)/android.policy.jar)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)





# ************************************************

core/java/android/app/StatusBarManager.java

+6 −13
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import android.os.RemoteException; 
import android.os.IBinder;

import android.os.ServiceManager;



import com.android.internal.statusbar.IStatusBarService;



/**

 * Allows an app to control the status bar.

 *
@@ -116,27 +118,18 @@ public class StatusBarManager { 
        }

    }



    public IBinder addIcon(String slot, int iconId, int iconLevel) {

        try {

            return mService.addIcon(slot, mContext.getPackageName(), iconId, iconLevel);

        } catch (RemoteException ex) {

            // system process is dead anyway.

            throw new RuntimeException(ex);

        }

    }



    public void updateIcon(IBinder key, String slot, int iconId, int iconLevel) {

    public void setIcon(String slot, int iconId, int iconLevel) {

        try {

            mService.updateIcon(key, slot, mContext.getPackageName(), iconId, iconLevel);

            mService.setIcon(slot, mContext.getPackageName(), iconId, iconLevel);

        } catch (RemoteException ex) {

            // system process is dead anyway.

            throw new RuntimeException(ex);

        }

    }



    public void removeIcon(IBinder key) {

    public void removeIcon(String slot) {

        try {

            mService.removeIcon(key);

            mService.removeIcon(slot);

        } catch (RemoteException ex) {

            // system process is dead anyway.

            throw new RuntimeException(ex);

core/java/android/app/IStatusBar.aidl→core/java/com/android/internal/statusbar/IStatusBar.aidl

+6 −2
Original line number Diff line number Diff line
@@ -14,10 +14,14 @@ 
 * limitations under the License.

 */

 

package android.app;

package com.android.internal.statusbar;



import com.android.internal.statusbar.StatusBarIcon;



/** @hide */

interface IStatusBar

oneway interface IStatusBar

{

    void setIcon(int index, in StatusBarIcon icon);

    void removeIcon(int index);

}

core/java/android/app/IStatusBarService.aidl→core/java/com/android/internal/statusbar/IStatusBarService.aidl

+8 −6
Original line number Diff line number Diff line
@@ -14,9 +14,11 @@ 
 * limitations under the License.

 */

 

package android.app;

package com.android.internal.statusbar;



import android.app.IStatusBar;

import com.android.internal.statusbar.IStatusBar;

import com.android.internal.statusbar.StatusBarIcon;

import com.android.internal.statusbar.StatusBarIconList;



/** @hide */

interface IStatusBarService
@@ -25,10 +27,10 @@ interface IStatusBarService 
    void deactivate();

    void toggle();

    void disable(int what, IBinder token, String pkg);

    IBinder addIcon(String slot, String iconPackage, int iconId, int iconLevel);

    void updateIcon(IBinder key, String slot, String iconPackage, int iconId, int iconLevel);

    void removeIcon(IBinder key);

    void setIcon(String slot, String iconPackage, int iconId, int iconLevel);

    void setIconVisibility(String slot, boolean visible);

    void removeIcon(String slot);



    // ---- Methods below are for use by the status bar policy services ----

    void registerStatusBar(IStatusBar callbacks);

    void registerStatusBar(IStatusBar callbacks, out StatusBarIconList state);

}