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

Commit 921f8e35 authored by Chong Zhang's avatar Chong Zhang
Browse files

resolve merge conflicts of 9391bc55 to master 

Change-Id: I6de231781233826b399688dc8ead70ba515b1ccb
parents ff469131 9391bc55

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -43999,6 +43999,7 @@ package android.view { 
    field public static final int TYPE_APPLICATION_SUB_PANEL = 1002; // 0x3ea

    field public static final int TYPE_BASE_APPLICATION = 1; // 0x1

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

    field public static final int TYPE_DRAWN_APPLICATION = 4; // 0x4

    field public static final int TYPE_INPUT_METHOD = 2011; // 0x7db

    field public static final int TYPE_INPUT_METHOD_DIALOG = 2012; // 0x7dc

    field public static final int TYPE_KEYGUARD_DIALOG = 2009; // 0x7d9

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -47172,6 +47172,7 @@ package android.view { 
    field public static final int TYPE_APPLICATION_SUB_PANEL = 1002; // 0x3ea

    field public static final int TYPE_BASE_APPLICATION = 1; // 0x1

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

    field public static final int TYPE_DRAWN_APPLICATION = 4; // 0x4

    field public static final int TYPE_INPUT_METHOD = 2011; // 0x7db

    field public static final int TYPE_INPUT_METHOD_DIALOG = 2012; // 0x7dc

    field public static final int TYPE_KEYGUARD_DIALOG = 2009; // 0x7d9

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -44080,6 +44080,7 @@ package android.view { 
    field public static final int TYPE_APPLICATION_SUB_PANEL = 1002; // 0x3ea

    field public static final int TYPE_BASE_APPLICATION = 1; // 0x1

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

    field public static final int TYPE_DRAWN_APPLICATION = 4; // 0x4

    field public static final int TYPE_INPUT_METHOD = 2011; // 0x7db

    field public static final int TYPE_INPUT_METHOD_DIALOG = 2012; // 0x7dc

    field public static final int TYPE_KEYGUARD_DIALOG = 2009; // 0x7d9

core/java/android/view/WindowManager.java

+9 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ public interface WindowManager extends ViewManager { 
         * @see #TYPE_BASE_APPLICATION

         * @see #TYPE_APPLICATION

         * @see #TYPE_APPLICATION_STARTING

         * @see #TYPE_DRAWN_APPLICATION

         * @see #TYPE_APPLICATION_PANEL

         * @see #TYPE_APPLICATION_MEDIA

         * @see #TYPE_APPLICATION_SUB_PANEL
@@ -244,6 +245,7 @@ public interface WindowManager extends ViewManager { 
            @ViewDebug.IntToString(from = TYPE_BASE_APPLICATION, to = "TYPE_BASE_APPLICATION"),

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

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

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

            @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"),
@@ -314,6 +316,13 @@ public interface WindowManager extends ViewManager { 
         */

        public static final int TYPE_APPLICATION_STARTING = 3;



        /**

         * Window type: a variation on TYPE_APPLICATION that ensures the window

         * manager will wait for this window to be drawn before the app is shown.

         * In multiuser systems shows only on the owning user's window.

         */

        public static final int TYPE_DRAWN_APPLICATION = 4;



        /**

         * End of types of application windows.

         */

core/java/com/android/internal/policy/DecorView.java

+2 −1
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATIO 
import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;

import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;

import static android.view.WindowManager.LayoutParams.TYPE_DRAWN_APPLICATION;

import static com.android.internal.policy.PhoneWindow.FEATURE_OPTIONS_PANEL;



/** @hide */
@@ -1860,7 +1861,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
        }

        final WindowManager.LayoutParams attrs = mWindow.getAttributes();

        final boolean isApplication = attrs.type == TYPE_BASE_APPLICATION ||

                attrs.type == TYPE_APPLICATION;

                attrs.type == TYPE_APPLICATION || attrs.type == TYPE_DRAWN_APPLICATION;

        // Only a non floating application window on one of the allowed workspaces can get a caption

        if (!mWindow.isFloating() && isApplication && StackId.hasWindowDecor(mStackId)) {

            // Dependent on the brightness of the used title we either use the