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

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

Merge "Also inherit FLAG_FORCE_DRAWS_STATUS_BAR_BACKGROUND" into oc-dev

parents beba1bf9 d2616327

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -102,6 +102,8 @@ class TaskSnapshotSurface implements StartingSurface { 
            | FLAG_SCALED

            | FLAG_SCALED

            | FLAG_SECURE;

            | FLAG_SECURE;





    private static final int PRIVATE_FLAG_INHERITS = PRIVATE_FLAG_FORCE_DRAW_STATUS_BAR_BACKGROUND;



    private static final String TAG = TAG_WITH_CLASS_NAME ? "SnapshotStartingWindow" : TAG_WM;

    private static final String TAG = TAG_WITH_CLASS_NAME ? "SnapshotStartingWindow" : TAG_WM;

    private static final int MSG_REPORT_DRAW = 0;

    private static final int MSG_REPORT_DRAW = 0;

    private static final String TITLE_FORMAT = "SnapshotStartingWindow for taskId=%s";

    private static final String TITLE_FORMAT = "SnapshotStartingWindow for taskId=%s";
@@ -160,7 +162,8 @@ class TaskSnapshotSurface implements StartingSurface { 
            layoutParams.flags = (windowFlags & ~FLAG_INHERIT_EXCLUDES)

            layoutParams.flags = (windowFlags & ~FLAG_INHERIT_EXCLUDES)

                    | FLAG_NOT_FOCUSABLE

                    | FLAG_NOT_FOCUSABLE

                    | FLAG_NOT_TOUCHABLE;

                    | FLAG_NOT_TOUCHABLE;

            layoutParams.privateFlags = PRIVATE_FLAG_TASK_SNAPSHOT;

            layoutParams.privateFlags = PRIVATE_FLAG_TASK_SNAPSHOT

                    | (windowPrivateFlags & PRIVATE_FLAG_INHERITS);

            layoutParams.token = token.token;

            layoutParams.token = token.token;

            layoutParams.width = LayoutParams.MATCH_PARENT;

            layoutParams.width = LayoutParams.MATCH_PARENT;

            layoutParams.height = LayoutParams.MATCH_PARENT;

            layoutParams.height = LayoutParams.MATCH_PARENT;