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

Commit 07473cea authored by Jason Monk's avatar Jason Monk
Browse files

Cleanup the status bar flow. 

 - Don't round trip to the status bar manager to know the state
 - Manage the state of icons closer to where they are displayed
 - Move StatusBarIconList into SysUI because it isn't used elsewhere now

Change-Id: I99c4c290c18fc776914a43b1cde157f92bb36ac2
parent 472a5669

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

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import com.android.internal.statusbar.StatusBarIcon; 
/** @hide */

oneway interface IStatusBar

{

    void setIcon(int index, in StatusBarIcon icon);

    void removeIcon(int index);

    void setIcon(String slot, in StatusBarIcon icon);

    void removeIcon(String slot);

    void disable(int state1, int state2);

    void animateExpandNotificationsPanel();

    void animateExpandSettingsPanel(String subPanel);

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

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ interface IStatusBarService 


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

    // You need the STATUS_BAR_SERVICE permission

    void registerStatusBar(IStatusBar callbacks, out StatusBarIconList iconList,

    void registerStatusBar(IStatusBar callbacks, out List<String> iconSlots,

            out List<StatusBarIcon> iconList,

            out int[] switches, out List<IBinder> binders);

    void onPanelRevealed(boolean clearNotificationEffects, int numItems);

    void onPanelHidden();

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+8 −14
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.animation.AnimatorListenerAdapter; 
import android.animation.TimeInterpolator;

import android.app.ActivityManager;

import android.app.ActivityManagerNative;

import android.app.INotificationManager;

import android.app.Notification;

import android.app.NotificationManager;

import android.app.PendingIntent;
@@ -82,11 +81,9 @@ import android.widget.ImageView; 
import android.widget.RemoteViews;

import android.widget.TextView;

import android.widget.Toast;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.statusbar.StatusBarIcon;

import com.android.internal.statusbar.StatusBarIconList;

import com.android.internal.util.NotificationColorUtil;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardUpdateMonitor;
@@ -647,13 +644,14 @@ public abstract class BaseStatusBar extends SystemUI implements 
                android.R.interpolator.fast_out_linear_in);



        // Connect in to the status bar manager service

        StatusBarIconList iconList = new StatusBarIconList();

        mCommandQueue = new CommandQueue(this, iconList);

        mCommandQueue = new CommandQueue(this);



        int[] switches = new int[8];

        ArrayList<IBinder> binders = new ArrayList<IBinder>();

        ArrayList<String> iconSlots = new ArrayList<>();

        ArrayList<StatusBarIcon> icons = new ArrayList<>();

        try {

            mBarService.registerStatusBar(mCommandQueue, iconList, switches, binders);

            mBarService.registerStatusBar(mCommandQueue, iconSlots, icons, switches, binders);

        } catch (RemoteException ex) {

            // If the system process isn't there we're doomed anyway.

        }
@@ -668,14 +666,10 @@ public abstract class BaseStatusBar extends SystemUI implements 
        setImeWindowStatus(binders.get(0), switches[3], switches[4], switches[5] != 0);



        // Set up the initial icon state

        int N = iconList.size();

        int N = iconSlots.size();

        int viewIndex = 0;

        for (int i=0; i < N; i++) {

            StatusBarIcon icon = iconList.getIcon(i);

            if (icon != null) {

                addIcon(iconList.getSlot(i), i, viewIndex, icon);

                viewIndex++;

            }

            setIcon(iconSlots.get(i), icons.get(i));

        }



        // Set up the initial notification state.
@@ -691,7 +685,7 @@ public abstract class BaseStatusBar extends SystemUI implements 
        if (DEBUG) {

            Log.d(TAG, String.format(

                    "init: icons=%d disabled=0x%08x lights=0x%08x menu=0x%08x imeButton=0x%08x",

                   iconList.size(),

                   icons.size(),

                   switches[0],

                   switches[1],

                   switches[2],

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

+40 −59
Original line number Diff line number Diff line
@@ -21,10 +21,8 @@ import android.os.Handler; 
import android.os.IBinder;

import android.os.Message;

import android.util.Pair;



import com.android.internal.statusbar.IStatusBar;

import com.android.internal.statusbar.StatusBarIcon;

import com.android.internal.statusbar.StatusBarIconList;



/**

 * This class takes the functions from IStatusBar that come in on
@@ -76,7 +74,7 @@ public class CommandQueue extends IStatusBar.Stub { 


    private static final String SHOW_IME_SWITCHER_KEY = "showImeSwitcherKey";



    private StatusBarIconList mList;

    private final Object mLock = new Object();

    private Callbacks mCallbacks;

    private Handler mHandler = new H();
@@ -84,10 +82,8 @@ public class CommandQueue extends IStatusBar.Stub { 
     * These methods are called back on the main thread.

     */

    public interface Callbacks {

        public void addIcon(String slot, int index, int viewIndex, StatusBarIcon icon);

        public void updateIcon(String slot, int index, int viewIndex,

                StatusBarIcon old, StatusBarIcon icon);

        public void removeIcon(String slot, int index, int viewIndex);

        public void setIcon(String slot, StatusBarIcon icon);

        public void removeIcon(String slot);

        public void disable(int state1, int state2, boolean animate);

        public void animateExpandNotificationsPanel();

        public void animateCollapsePanels(int flags);
@@ -115,57 +111,55 @@ public class CommandQueue extends IStatusBar.Stub { 
        public void onCameraLaunchGestureDetected(int source);

    }



    public CommandQueue(Callbacks callbacks, StatusBarIconList list) {

    public CommandQueue(Callbacks callbacks) {

        mCallbacks = callbacks;

        mList = list;

    }



    public void setIcon(int index, StatusBarIcon icon) {

        synchronized (mList) {

            int what = MSG_ICON | index;

            mHandler.removeMessages(what);

            mHandler.obtainMessage(what, OP_SET_ICON, 0, icon.clone()).sendToTarget();

    public void setIcon(String slot, StatusBarIcon icon) {

        synchronized (mLock) {

            // don't coalesce these

            mHandler.obtainMessage(MSG_ICON, OP_SET_ICON, 0,

                    new Pair<String, StatusBarIcon>(slot, icon)).sendToTarget();

        }

    }



    public void removeIcon(int index) {

        synchronized (mList) {

            int what = MSG_ICON | index;

            mHandler.removeMessages(what);

            mHandler.obtainMessage(what, OP_REMOVE_ICON, 0, null).sendToTarget();

    public void removeIcon(String slot) {

        synchronized (mLock) {

            // don't coalesce these

            mHandler.obtainMessage(MSG_ICON, OP_REMOVE_ICON, 0, slot).sendToTarget();

        }

    }



    public void disable(int state1, int state2) {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_DISABLE);

            mHandler.obtainMessage(MSG_DISABLE, state1, state2, null).sendToTarget();

        }

    }



    public void animateExpandNotificationsPanel() {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_EXPAND_NOTIFICATIONS);

            mHandler.sendEmptyMessage(MSG_EXPAND_NOTIFICATIONS);

        }

    }



    public void animateCollapsePanels() {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_COLLAPSE_PANELS);

            mHandler.sendEmptyMessage(MSG_COLLAPSE_PANELS);

        }

    }



    public void animateExpandSettingsPanel(String subPanel) {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_EXPAND_SETTINGS);

            mHandler.obtainMessage(MSG_EXPAND_SETTINGS, subPanel).sendToTarget();

        }

    }



    public void setSystemUiVisibility(int vis, int mask) {

        synchronized (mList) {

        synchronized (mLock) {

            // Don't coalesce these, since it might have one time flags set such as

            // STATUS_BAR_UNHIDE which might get lost.

            mHandler.obtainMessage(MSG_SET_SYSTEMUI_VISIBILITY, vis, mask, null).sendToTarget();
@@ -173,7 +167,7 @@ public class CommandQueue extends IStatusBar.Stub { 
    }



    public void topAppWindowChanged(boolean menuVisible) {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_TOP_APP_WINDOW_CHANGED);

            mHandler.obtainMessage(MSG_TOP_APP_WINDOW_CHANGED, menuVisible ? 1 : 0, 0,

                    null).sendToTarget();
@@ -182,7 +176,7 @@ public class CommandQueue extends IStatusBar.Stub { 


    public void setImeWindowStatus(IBinder token, int vis, int backDisposition,

            boolean showImeSwitcher) {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_SHOW_IME_BUTTON);

            Message m = mHandler.obtainMessage(MSG_SHOW_IME_BUTTON, vis, backDisposition, token);

            m.getData().putBoolean(SHOW_IME_SWITCHER_KEY, showImeSwitcher);
@@ -191,7 +185,7 @@ public class CommandQueue extends IStatusBar.Stub { 
    }



    public void showRecentApps(boolean triggeredFromAltTab) {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_SHOW_RECENT_APPS);

            mHandler.obtainMessage(MSG_SHOW_RECENT_APPS,

                    triggeredFromAltTab ? 1 : 0, 0, null).sendToTarget();
@@ -199,7 +193,7 @@ public class CommandQueue extends IStatusBar.Stub { 
    }



    public void hideRecentApps(boolean triggeredFromAltTab, boolean triggeredFromHomeKey) {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_HIDE_RECENT_APPS);

            mHandler.obtainMessage(MSG_HIDE_RECENT_APPS,

                    triggeredFromAltTab ? 1 : 0, triggeredFromHomeKey ? 1 : 0,
@@ -208,21 +202,21 @@ public class CommandQueue extends IStatusBar.Stub { 
    }



    public void toggleRecentApps() {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_TOGGLE_RECENT_APPS);

            mHandler.obtainMessage(MSG_TOGGLE_RECENT_APPS, 0, 0, null).sendToTarget();

        }

    }



    public void preloadRecentApps() {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_PRELOAD_RECENT_APPS);

            mHandler.obtainMessage(MSG_PRELOAD_RECENT_APPS, 0, 0, null).sendToTarget();

        }

    }



    public void cancelPreloadRecentApps() {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_CANCEL_PRELOAD_RECENT_APPS);

            mHandler.obtainMessage(MSG_CANCEL_PRELOAD_RECENT_APPS, 0, 0, null).sendToTarget();

        }
@@ -230,61 +224,61 @@ public class CommandQueue extends IStatusBar.Stub { 


    @Override

    public void toggleKeyboardShortcutsMenu() {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_TOGGLE_KEYBOARD_SHORTCUTS);

            mHandler.obtainMessage(MSG_TOGGLE_KEYBOARD_SHORTCUTS).sendToTarget();

        }

    }



    public void setWindowState(int window, int state) {

        synchronized (mList) {

        synchronized (mLock) {

            // don't coalesce these

            mHandler.obtainMessage(MSG_SET_WINDOW_STATE, window, state, null).sendToTarget();

        }

    }



    public void buzzBeepBlinked() {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_BUZZ_BEEP_BLINKED);

            mHandler.sendEmptyMessage(MSG_BUZZ_BEEP_BLINKED);

        }

    }



    public void notificationLightOff() {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.sendEmptyMessage(MSG_NOTIFICATION_LIGHT_OFF);

        }

    }



    public void notificationLightPulse(int argb, int onMillis, int offMillis) {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.obtainMessage(MSG_NOTIFICATION_LIGHT_PULSE, onMillis, offMillis, argb)

                    .sendToTarget();

        }

    }



    public void showScreenPinningRequest() {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.sendEmptyMessage(MSG_SHOW_SCREEN_PIN_REQUEST);

        }

    }



    public void appTransitionPending() {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_APP_TRANSITION_PENDING);

            mHandler.sendEmptyMessage(MSG_APP_TRANSITION_PENDING);

        }

    }



    public void appTransitionCancelled() {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_APP_TRANSITION_PENDING);

            mHandler.sendEmptyMessage(MSG_APP_TRANSITION_PENDING);

        }

    }



    public void appTransitionStarting(long startTime, long duration) {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_APP_TRANSITION_STARTING);

            mHandler.obtainMessage(MSG_APP_TRANSITION_STARTING, Pair.create(startTime, duration))

                    .sendToTarget();
@@ -292,14 +286,14 @@ public class CommandQueue extends IStatusBar.Stub { 
    }



    public void showAssistDisclosure() {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_ASSIST_DISCLOSURE);

            mHandler.obtainMessage(MSG_ASSIST_DISCLOSURE).sendToTarget();

        }

    }



    public void startAssist(Bundle args) {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_START_ASSIST);

            mHandler.obtainMessage(MSG_START_ASSIST, args).sendToTarget();

        }
@@ -307,7 +301,7 @@ public class CommandQueue extends IStatusBar.Stub { 


    @Override

    public void onCameraLaunchGestureDetected(int source) {

        synchronized (mList) {

        synchronized (mLock) {

            mHandler.removeMessages(MSG_CAMERA_LAUNCH_GESTURE);

            mHandler.obtainMessage(MSG_CAMERA_LAUNCH_GESTURE, source, 0).sendToTarget();

        }
@@ -318,27 +312,14 @@ public class CommandQueue extends IStatusBar.Stub { 
            final int what = msg.what & MSG_MASK;

            switch (what) {

                case MSG_ICON: {

                    final int index = msg.what & INDEX_MASK;

                    final int viewIndex = mList.getViewIndex(index);

                    switch (msg.arg1) {

                        case OP_SET_ICON: {

                            StatusBarIcon icon = (StatusBarIcon)msg.obj;

                            StatusBarIcon old = mList.getIcon(index);

                            if (old == null) {

                                mList.setIcon(index, icon);

                                mCallbacks.addIcon(mList.getSlot(index), index, viewIndex, icon);

                            } else {

                                mList.setIcon(index, icon);

                                mCallbacks.updateIcon(mList.getSlot(index), index, viewIndex,

                                        old, icon);

                            }

                            Pair<String, StatusBarIcon> p = (Pair<String, StatusBarIcon>) msg.obj;

                            mCallbacks.setIcon(p.first, p.second);

                            break;

                        }

                        case OP_REMOVE_ICON:

                            if (mList.getIcon(index) != null) {

                                mList.removeIcon(index);

                                mCallbacks.removeIcon(mList.getSlot(index), index, viewIndex);

                            }

                            mCallbacks.removeIcon((String) msg.obj);

                            break;

                    }

                    break;

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+8 −14
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ import android.view.MotionEvent; 
import android.view.ThreadedRenderer;

import android.view.VelocityTracker;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup.LayoutParams;

import android.view.ViewStub;

import android.view.WindowManager;
@@ -95,7 +94,6 @@ import android.view.animation.LinearInterpolator; 
import android.view.animation.PathInterpolator;

import android.widget.ImageView;

import android.widget.TextView;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.statusbar.NotificationVisibility;

import com.android.internal.statusbar.StatusBarIcon;
@@ -152,7 +150,6 @@ import com.android.systemui.statusbar.policy.LocationControllerImpl; 
import com.android.systemui.statusbar.policy.NetworkControllerImpl;

import com.android.systemui.statusbar.policy.NextAlarmController;

import com.android.systemui.statusbar.policy.PreviewInflater;

import com.android.systemui.statusbar.policy.RemoteInputView;

import com.android.systemui.statusbar.policy.RotationLockControllerImpl;

import com.android.systemui.statusbar.policy.SecurityControllerImpl;

import com.android.systemui.statusbar.policy.UserInfoController;
@@ -637,8 +634,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        addNavigationBar();



        // Lastly, call to the icon policy to install/update all the icons.

        mIconPolicy = new PhoneStatusBarPolicy(mContext, mCastController, mHotspotController,

                mUserInfoController, mBluetoothController);

        mIconPolicy = new PhoneStatusBarPolicy(mContext, mIconController, mCastController,

                mHotspotController, mUserInfoController, mBluetoothController);

        mIconPolicy.setCurrentUserSetup(mUserSetup);

        mSettingsObserver.onChange(false); // set up
@@ -1239,17 +1236,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        return lp;

    }



    public void addIcon(String slot, int index, int viewIndex, StatusBarIcon icon) {

        mIconController.addSystemIcon(slot, index, viewIndex, icon);

    }



    public void updateIcon(String slot, int index, int viewIndex,

            StatusBarIcon old, StatusBarIcon icon) {

        mIconController.updateSystemIcon(slot, index, viewIndex, old, icon);

    @Override

    public void setIcon(String slot, StatusBarIcon icon) {

        mIconController.setIcon(slot, icon);

    }



    public void removeIcon(String slot, int index, int viewIndex) {

        mIconController.removeSystemIcon(slot, index, viewIndex);

    @Override

    public void removeIcon(String slot) {

        mIconController.removeIcon(slot);

    }



    public UserHandle getCurrentUserHandle() {