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

Commit 0a8a2324 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #4603422: Compatibility mode button doesn't always update" into honeycomb-mr2

parents 86ef7977 7d04932e

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ oneway interface IStatusBar 
    void animateExpand();

    void animateCollapse();

    void setLightsOn(boolean on);

    void setMenuKeyVisible(boolean visible);

    void topAppWindowChanged(boolean menuVisible);

    void setImeWindowStatus(in IBinder token, int vis, int backDisposition);

    void setHardKeyboardStatus(boolean available, boolean enabled);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ interface IStatusBarService 
    void setIcon(String slot, String iconPackage, int iconId, int iconLevel);

    void setIconVisibility(String slot, boolean visible);

    void removeIcon(String slot);

    void setMenuKeyVisible(boolean visible);

    void topAppWindowChanged(boolean menuVisible);

    void setImeWindowStatus(in IBinder token, int vis, int backDisposition);



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

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
    <dimen name="status_bar_recents_thumbnail_max_height">64dp</dimen>

    <!-- Width of scrollable area in recents -->

    <dimen name="status_bar_recents_width">356dp</dimen>

    <!-- Amount to offset bottom of notification peek window from top of status bar. -->

    <dimen name="peek_window_y_offset">-12dp</dimen>



</resources>

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

+8 −7
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class CommandQueue extends IStatusBar.Stub { 


    private static final int MSG_SET_LIGHTS_ON = 0x00070000;



    private static final int MSG_SHOW_MENU = 0x00080000;

    private static final int MSG_TOP_APP_WINDOW_CHANGED = 0x00080000;

    private static final int MSG_SHOW_IME_BUTTON = 0x00090000;

    private static final int MSG_SET_HARD_KEYBOARD_STATUS = 0x000a0000;
@@ -82,7 +82,7 @@ public class CommandQueue extends IStatusBar.Stub { 
        public void animateExpand();

        public void animateCollapse();

        public void setLightsOn(boolean on);

        public void setMenuKeyVisible(boolean visible);

        public void topAppWindowChanged(boolean visible);

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

        public void setHardKeyboardStatus(boolean available, boolean enabled);

    }
@@ -160,10 +160,11 @@ public class CommandQueue extends IStatusBar.Stub { 
        }

    }



    public void setMenuKeyVisible(boolean visible) {

    public void topAppWindowChanged(boolean menuVisible) {

        synchronized (mList) {

            mHandler.removeMessages(MSG_SHOW_MENU);

            mHandler.obtainMessage(MSG_SHOW_MENU, visible ? 1 : 0, 0, null).sendToTarget();

            mHandler.removeMessages(MSG_TOP_APP_WINDOW_CHANGED);

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

                    null).sendToTarget();

        }

    }
@@ -240,8 +241,8 @@ public class CommandQueue extends IStatusBar.Stub { 
                case MSG_SET_LIGHTS_ON:

                    mCallbacks.setLightsOn(msg.arg1 != 0);

                    break;

                case MSG_SHOW_MENU:

                    mCallbacks.setMenuKeyVisible(msg.arg1 != 0);

                case MSG_TOP_APP_WINDOW_CHANGED:

                    mCallbacks.topAppWindowChanged(msg.arg1 != 0);

                    break;

                case MSG_SHOW_IME_BUTTON:

                    mCallbacks.setImeWindowStatus((IBinder)msg.obj, msg.arg1, msg.arg2);

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

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public abstract class StatusBar extends SystemUI implements CommandQueue.Callbac 


        disable(switches[0]);

        setLightsOn(switches[1] != 0);

        setMenuKeyVisible(switches[2] != 0);

        topAppWindowChanged(switches[2] != 0);

        // StatusBarManagerService has a back up of IME token and it's restored here.

        setImeWindowStatus(binders.get(0), switches[3], switches[4]);

        setHardKeyboardStatus(switches[5] != 0, switches[6] != 0);