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

Commit 3fe9cc5e authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of e95c07bd to master 

Change-Id: I9af0c08a9f1c1f68661efe051a66835e850b76f6
parents 051d16eb e95c07bd

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

    void userActivity();

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
@@ -44,6 +44,8 @@ 
    <dimen name="status_bar_recents_fading_edge_length">20dip</dimen>

    <!-- Margin between recents container and glow on the right -->

    <dimen name="status_bar_recents_right_glow_margin">100dip</dimen>

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

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



    <!-- thickness (height) of the navigation bar on phones that require it -->

    <dimen name="navigation_bar_size">42dp</dimen>

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

+8 −8
Original line number Diff line number Diff line
@@ -56,13 +56,12 @@ public class CommandQueue extends IStatusBar.Stub { 


    private static final int MSG_SET_LIGHTS_ON          = 7 << MSG_SHIFT;



    private static final int MSG_SHOW_MENU              = 8 << MSG_SHIFT;

    private static final int MSG_TOP_APP_WINDOW_CHANGED = 8 << MSG_SHIFT;

    private static final int MSG_SHOW_IME_BUTTON        = 9 << MSG_SHIFT;

    private static final int MSG_SET_HARD_KEYBOARD_STATUS = 10 << MSG_SHIFT;

    

    private static final int MSG_USER_ACTIVITY          = 11 << MSG_SHIFT;





    private StatusBarIconList mList;

    private Callbacks mCallbacks;

    private Handler mHandler = new H();
@@ -87,7 +86,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);

        public void userActivity();
@@ -166,10 +165,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();

        }

    }
@@ -253,8 +253,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);