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

Commit 29fc2c97 authored by Joe Onorato's avatar Joe Onorato
Browse files

Allow status bar panels to be on top of the status bar. 

Change-Id: I3c74ece5f7042e6302717f4263746d59d5447ec9
parent 93fbae34

core/java/android/view/WindowManager.java

+8 −1
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ public interface WindowManager extends ViewManager { 
            @ViewDebug.IntToString(from = TYPE_SYSTEM_OVERLAY, to = "TYPE_SYSTEM_OVERLAY"),

            @ViewDebug.IntToString(from = TYPE_PRIORITY_PHONE, to = "TYPE_PRIORITY_PHONE"),

            @ViewDebug.IntToString(from = TYPE_STATUS_BAR_PANEL, to = "TYPE_STATUS_BAR_PANEL"),

            @ViewDebug.IntToString(from = TYPE_STATUS_BAR_SUB_PANEL, to = "TYPE_STATUS_BAR_SUB_PANEL"),

            @ViewDebug.IntToString(from = TYPE_SYSTEM_DIALOG, to = "TYPE_SYSTEM_DIALOG"),

            @ViewDebug.IntToString(from = TYPE_KEYGUARD_DIALOG, to = "TYPE_KEYGUARD_DIALOG"),

            @ViewDebug.IntToString(from = TYPE_SYSTEM_ERROR, to = "TYPE_SYSTEM_ERROR"),
@@ -351,7 +352,7 @@ public interface WindowManager extends ViewManager { 
        public static final int TYPE_WALLPAPER          = FIRST_SYSTEM_WINDOW+13;



        /**

         * Window type: panel that slides out from the status bar

         * Window type: panel that slides out from over the status bar

         */

        public static final int TYPE_STATUS_BAR_PANEL   = FIRST_SYSTEM_WINDOW+14;
@@ -374,6 +375,12 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int TYPE_DRAG               = FIRST_SYSTEM_WINDOW+16;



        /**

         * Window type: panel that slides out from under the status bar

         */

        public static final int TYPE_STATUS_BAR_SUB_PANEL = FIRST_SYSTEM_WINDOW+17;





        /**

         * End of types of system windows.

         */

include/ui/InputDispatcher.h

+3 −1
Original line number Diff line number Diff line
@@ -179,8 +179,10 @@ struct InputWindow { 
        TYPE_INPUT_METHOD       = FIRST_SYSTEM_WINDOW+11,

        TYPE_INPUT_METHOD_DIALOG= FIRST_SYSTEM_WINDOW+12,

        TYPE_WALLPAPER          = FIRST_SYSTEM_WINDOW+13,

        TYPE_STATUS_BAR_PANEL   = FIRST_SYSTEM_WINDOW+14,

        TYPE_STATUS_BAR_SUB_PANEL  = FIRST_SYSTEM_WINDOW+14,

        TYPE_SECURE_SYSTEM_OVERLAY = FIRST_SYSTEM_WINDOW+15,

        TYPE_DRAG               = FIRST_SYSTEM_WINDOW+16,

        TYPE_STATUS_BAR_PANEL   = FIRST_SYSTEM_WINDOW+17,

        LAST_SYSTEM_WINDOW      = 2999,

    };

packages/SystemUI/res/layout-xlarge/sysbar_panel_notifications.xml

+1 −2
Original line number Diff line number Diff line
@@ -20,9 +20,8 @@ 
    android:layout_height="match_parent"

    android:layout_width="match_parent"

    android:animateLayoutChanges="true"

    android:background="@drawable/bg_scrim_notification"

    android:paddingTop="32dp"

    android:paddingBottom="32dp"

    android:paddingBottom="@dimen/status_bar_panel_bottom_offset"

    android:orientation="vertical"

    android:gravity="right"

    >

packages/SystemUI/res/values-xlarge/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
    <dimen name="notification_large_icon_height">60dp</dimen>

    <!-- The width of the ticker, including the icon -->

    <dimen name="notification_ticker_width">360dp</dimen>

    <!-- Status bar panel bottom offset (height of status bar - overlap) -->

    <dimen name="status_bar_panel_bottom_offset">36dp</dimen>

</resources>

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

+3 −3
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ public class PhoneStatusBar extends StatusBar { 
        WindowManager.LayoutParams lp = new WindowManager.LayoutParams(

                ViewGroup.LayoutParams.MATCH_PARENT,

                ViewGroup.LayoutParams.WRAP_CONTENT,

                WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL,

                WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL,

                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN

                    | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS

                    | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
@@ -1254,7 +1254,7 @@ public class PhoneStatusBar extends StatusBar { 
        lp = new WindowManager.LayoutParams(

                ViewGroup.LayoutParams.MATCH_PARENT,

                ViewGroup.LayoutParams.MATCH_PARENT,

                WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL,

                WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL,

                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN

                | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS

                | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
@@ -1282,7 +1282,7 @@ public class PhoneStatusBar extends StatusBar { 
        lp.height = getExpandedHeight();

        lp.x = 0;

        mTrackingPosition = lp.y = -disph; // sufficiently large negative

        lp.type = WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL;

        lp.type = WindowManager.LayoutParams.TYPE_STATUS_BAR_SUB_PANEL;

        lp.flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN

                | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS

                | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL