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

Commit 5ee32ac1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DisplayCutout: do not animate cutout (and rounded corner) overlay... 

Merge "DisplayCutout: do not animate cutout (and rounded corner) overlay during rotation" into pi-dev
parents a106a1a6 4bef62e9

services/core/java/com/android/server/policy/PhoneWindowManager.java

+9 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_ACQUIRES_SLEE 
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FORCE_DRAW_STATUS_BAR_BACKGROUND;

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

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

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

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

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

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;
@@ -2583,7 +2584,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    /** {@inheritDoc} */

    @Override

    public int checkAddPermission(WindowManager.LayoutParams attrs, int[] outAppOp) {

        int type = attrs.type;

        final int type = attrs.type;

        final boolean isRoundedCornerOverlay =

                (attrs.privateFlags & PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY) != 0;



        if (isRoundedCornerOverlay && mContext.checkCallingOrSelfPermission(INTERNAL_SYSTEM_WINDOW)

                != PERMISSION_GRANTED) {

            return ADD_PERMISSION_DENIED;

        }



        outAppOp[0] = AppOpsManager.OP_NONE;

services/core/java/com/android/server/wm/WindowManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW; 
import static android.view.WindowManager.LayoutParams.LAST_SUB_WINDOW;

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

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

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

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

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

import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
@@ -1214,8 +1215,10 @@ public class WindowManagerService extends IWindowManager.Stub 
                    }

                }

                final IBinder binder = attrs.token != null ? attrs.token : client.asBinder();

                final boolean isRoundedCornerOverlay =

                        (attrs.privateFlags & PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY) != 0;

                token = new WindowToken(this, binder, type, false, displayContent,

                        session.mCanAddInternalSystemWindow);

                        session.mCanAddInternalSystemWindow, isRoundedCornerOverlay);

            } else if (rootType >= FIRST_APPLICATION_WINDOW && rootType <= LAST_APPLICATION_WINDOW) {

                atoken = token.asAppWindowToken();

                if (atoken == null) {

services/core/java/com/android/server/wm/WindowToken.java

+17 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.wm;



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



import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_FOCUS;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_WINDOW_MOVEMENT;
@@ -53,6 +54,9 @@ class WindowToken extends WindowContainer<WindowState> { 
    // The type of window this token is for, as per WindowManager.LayoutParams.

    final int windowType;



    /** {@code true} if this holds the rounded corner overlay */

    final boolean mRoundedCornerOverlay;



    // Set if this token was explicitly added by a client, so should

    // persist (not be removed) when all windows are removed.

    boolean mPersistOnEmpty;
@@ -105,11 +109,18 @@ class WindowToken extends WindowContainer<WindowState> { 


    WindowToken(WindowManagerService service, IBinder _token, int type, boolean persistOnEmpty,

            DisplayContent dc, boolean ownerCanManageAppTokens) {

        this(service, _token, type, persistOnEmpty, dc, ownerCanManageAppTokens,

                false /* roundedCornersOverlay */);

    }



    WindowToken(WindowManagerService service, IBinder _token, int type, boolean persistOnEmpty,

            DisplayContent dc, boolean ownerCanManageAppTokens, boolean roundedCornerOverlay) {

        super(service);

        token = _token;

        windowType = type;

        mPersistOnEmpty = persistOnEmpty;

        mOwnerCanManageAppTokens = ownerCanManageAppTokens;

        mRoundedCornerOverlay = roundedCornerOverlay;

        onDisplayChanged(dc);

    }
@@ -259,6 +270,12 @@ class WindowToken extends WindowContainer<WindowState> { 
        dc.reParentWindowToken(this);

        mDisplayContent = dc;



        // The rounded corner overlay should not be rotated. We ensure that by moving it outside

        // the windowing layer.

        if (mRoundedCornerOverlay) {

            mDisplayContent.reparentToOverlay(mPendingTransaction, mSurfaceControl);

        }



        // TODO(b/36740756): One day this should perhaps be hooked

        // up with goodToGo, so we don't move a window

        // to another display before the window behind