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

Commit eb5b8b1c authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Remove the layer of task overlay activities" into udc-dev am: af5033e8 am: 8ca72eb9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22089922



Change-Id: Iaae6080eeccd7231f59801a1a899bd103b6dc624
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 46735d1c 8ca72eb9

core/java/android/window/TaskConstants.java

+1 −10
Original line number Diff line number Diff line
@@ -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 {}

}