From 2d967e45be8367ac6c585835171dcce8383934f3 Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Wed, 15 Mar 2023 03:10:59 +0000 Subject: [PATCH] Remove the layer of task overlay activities The task overlay activities should be on the same layer as other activities in the task. It is already ensured to be on top of other activities by making it always-on-top in wm hierarchy. Bug: 262404281 Test: build and presubmit Change-Id: I0f4123355d711acb3a87e91c9523468f789da154 --- core/java/android/window/TaskConstants.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/core/java/android/window/TaskConstants.java b/core/java/android/window/TaskConstants.java index c40384027adfe..3a04198a3addb 100644 --- a/core/java/android/window/TaskConstants.java +++ b/core/java/android/window/TaskConstants.java @@ -79,14 +79,6 @@ public class TaskConstants { */ public static final int TASK_CHILD_LAYER_TASK_OVERLAY = 5 * TASK_CHILD_LAYER_REGION_SIZE; - /** - * Legacy machanism to force an activity to the top of the task (i.e. for work profile - * comfirmation). - * @hide - */ - public static final int TASK_CHILD_LAYER_TASK_OVERLAY_ACTIVITIES = - 6 * TASK_CHILD_LAYER_REGION_SIZE; - /** * Z-orders of task child layers other than activities, task fragments and layers interleaved * with them, e.g. IME windows. [-10000, 10000) is reserved for these layers. @@ -99,8 +91,7 @@ public class TaskConstants { TASK_CHILD_LAYER_LETTERBOX_EDUCATION, TASK_CHILD_LAYER_WINDOW_DECORATIONS, TASK_CHILD_LAYER_RECENTS_ANIMATION_PIP_OVERLAY, - TASK_CHILD_LAYER_TASK_OVERLAY, - TASK_CHILD_LAYER_TASK_OVERLAY_ACTIVITIES + TASK_CHILD_LAYER_TASK_OVERLAY }) public @interface TaskChildLayer {} }