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

Commit 32230ef4 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Collapse/disable shade when hiding status bar window."

parents 7ce7f322 9764218f

core/java/android/app/StatusBarManager.java

+6 −0
Original line number Diff line number Diff line
@@ -63,6 +63,12 @@ public class StatusBarManager { 
    public static final int NAVIGATION_HINT_RECENT_NOP    = 1 << 2;

    public static final int NAVIGATION_HINT_BACK_ALT      = 1 << 3;



    public static final int WINDOW_STATUS_BAR = 1;

    public static final int WINDOW_NAVIGATION_BAR = 2;



    public static final int WINDOW_STATE_HIDING = 1;

    public static final int WINDOW_STATE_SHOWING = 2;



    private Context mContext;

    private IStatusBarService mService;

    private IBinder mToken = new Binder();

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

+1 −0
Original line number Diff line number Diff line
@@ -38,5 +38,6 @@ oneway interface IStatusBar 
    void toggleRecentApps();

    void preloadRecentApps();

    void cancelPreloadRecentApps();

    void setWindowState(int window, int state);

}

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

+1 −0
Original line number Diff line number Diff line
@@ -51,4 +51,5 @@ interface IStatusBarService 
    void toggleRecentApps();

    void preloadRecentApps();

    void cancelPreloadRecentApps();

    void setWindowState(int window, int state);

}

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

+12 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ public class CommandQueue extends IStatusBar.Stub { 
    private static final int MSG_PRELOAD_RECENT_APPS        = 14 << MSG_SHIFT;

    private static final int MSG_CANCEL_PRELOAD_RECENT_APPS = 15 << MSG_SHIFT;

    private static final int MSG_SET_NAVIGATION_ICON_HINTS  = 16 << MSG_SHIFT;

    private static final int MSG_SET_WINDOW_STATE           = 17 << MSG_SHIFT;



    public static final int FLAG_EXCLUDE_NONE = 0;

    public static final int FLAG_EXCLUDE_SEARCH_PANEL = 1 << 0;
@@ -98,6 +99,7 @@ public class CommandQueue extends IStatusBar.Stub { 
        public void hideSearchPanel();

        public void cancelPreloadRecentApps();

        public void setNavigationIconHints(int hints);

        public void setWindowState(int window, int state);

    }



    public CommandQueue(Callbacks callbacks, StatusBarIconList list) {
@@ -232,6 +234,13 @@ public class CommandQueue extends IStatusBar.Stub { 
        }

    }



    public void setWindowState(int window, int state) {

        synchronized (mList) {

            mHandler.removeMessages(MSG_SET_WINDOW_STATE);

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

        }

    }



    private final class H extends Handler {

        public void handleMessage(Message msg) {

            final int what = msg.what & MSG_MASK;
@@ -312,6 +321,9 @@ public class CommandQueue extends IStatusBar.Stub { 
                case MSG_SET_NAVIGATION_ICON_HINTS:

                    mCallbacks.setNavigationIconHints(msg.arg1);

                    break;

                case MSG_SET_WINDOW_STATE:

                    mCallbacks.setWindowState(msg.arg1, msg.arg2);

                    break;

            }

        }

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ public class PanelBar extends FrameLayout { 
            } else {

                pv.setExpandedFraction(0); // just in case

                pv.setVisibility(View.GONE);

                pv.cancelPeek();

            }

        }

        if (DEBUG) LOG("collapseAllPanels: animate=%s waiting=%s", animate, waiting);