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

Commit 500c1b81 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Added TYPE_APPLICATION_ABOVE_SUB_PANEL window type."

parents afbcabd8 0a4dc225

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -37028,6 +37028,7 @@ package android.view { 
    field public static final int TITLE_CHANGED = 64; // 0x40

    field public static final int TYPE_ACCESSIBILITY_OVERLAY = 2032; // 0x7f0

    field public static final int TYPE_APPLICATION = 2; // 0x2

    field public static final int TYPE_APPLICATION_ABOVE_SUB_PANEL = 1005; // 0x3ed

    field public static final int TYPE_APPLICATION_ATTACHED_DIALOG = 1003; // 0x3eb

    field public static final int TYPE_APPLICATION_MEDIA = 1001; // 0x3e9

    field public static final int TYPE_APPLICATION_PANEL = 1000; // 0x3e8

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -39197,6 +39197,7 @@ package android.view { 
    field public static final int TITLE_CHANGED = 64; // 0x40

    field public static final int TYPE_ACCESSIBILITY_OVERLAY = 2032; // 0x7f0

    field public static final int TYPE_APPLICATION = 2; // 0x2

    field public static final int TYPE_APPLICATION_ABOVE_SUB_PANEL = 1005; // 0x3ed

    field public static final int TYPE_APPLICATION_ATTACHED_DIALOG = 1003; // 0x3eb

    field public static final int TYPE_APPLICATION_MEDIA = 1001; // 0x3e9

    field public static final int TYPE_APPLICATION_PANEL = 1000; // 0x3e8

core/java/android/view/Window.java

+2 −0
Original line number Diff line number Diff line
@@ -595,6 +595,8 @@ public abstract class Window { 
                    title="Panel";

                } else if (wp.type == WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL) {

                    title="SubPanel";

                } else if (wp.type == WindowManager.LayoutParams.TYPE_APPLICATION_ABOVE_SUB_PANEL) {

                    title="AboveSubPanel";

                } else if (wp.type == WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG) {

                    title="AtchDlg";

                } else {

core/java/android/view/WindowManager.java

+25 −16
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ public interface WindowManager extends ViewManager { 
         * @see #TYPE_APPLICATION_PANEL

         * @see #TYPE_APPLICATION_MEDIA

         * @see #TYPE_APPLICATION_SUB_PANEL

         * @see #TYPE_APPLICATION_ABOVE_SUB_PANEL

         * @see #TYPE_APPLICATION_ATTACHED_DIALOG

         * @see #TYPE_STATUS_BAR

         * @see #TYPE_SEARCH_BAR
@@ -193,6 +194,7 @@ public interface WindowManager extends ViewManager { 
            @ViewDebug.IntToString(from = TYPE_APPLICATION_PANEL, to = "TYPE_APPLICATION_PANEL"),

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

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

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

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

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

            @ViewDebug.IntToString(from = TYPE_STATUS_BAR, to = "TYPE_STATUS_BAR"),
@@ -303,6 +305,13 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int TYPE_APPLICATION_MEDIA_OVERLAY  = FIRST_SUB_WINDOW + 4;



        /**

         * Window type: a above sub-panel on top of an application window and it's

         * sub-panel windows. These windows are displayed on top of their attached window

         * and any {@link #TYPE_APPLICATION_SUB_PANEL} panels.

         */

        public static final int TYPE_APPLICATION_ABOVE_SUB_PANEL = FIRST_SUB_WINDOW + 5;



        /**

         * End of types of sub-windows.

         */

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -3154,6 +3154,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
                case WindowManager.LayoutParams.TYPE_APPLICATION_PANEL:

                case WindowManager.LayoutParams.TYPE_APPLICATION_STARTING:

                case WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL:

                case WindowManager.LayoutParams.TYPE_APPLICATION_ABOVE_SUB_PANEL:

                case WindowManager.LayoutParams.TYPE_BASE_APPLICATION:

                case WindowManager.LayoutParams.TYPE_PHONE:

                case WindowManager.LayoutParams.TYPE_PRIORITY_PHONE: