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

Commit 45f48d30 authored by Galia Peycheva's avatar Galia Peycheva
Browse files

Create ACTIVITY_TYPE_DREAM 

Previously the dream activity was of a standard activity type. This
allows other activities to be started in front of it, which should not
happen.

This CL adds a new ACTIVITY_TYPE_DREAM and makes dream activities to be
attached on top of all other activities. It also adds activities of type
dream to be one of the always on top activities.

Bug: 150749838

Test: make && flash; start PiP and then start the screensaver. Verify
      that PiP is hidden by the dream.

Change-Id: I852db2455d580d5c99aca3dbbd1ee3bea20aa7ae
parent a37fc59f

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -535,6 +535,7 @@ package android.app { 
    method public void setWindowingMode(int);

    method public void writeToParcel(android.os.Parcel, int);

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

    field public static final int ACTIVITY_TYPE_DREAM = 5; // 0x5

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

    field public static final int ACTIVITY_TYPE_RECENTS = 3; // 0x3

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

core/java/android/app/WindowConfiguration.java

+10 −4
Original line number Diff line number Diff line
@@ -141,6 +141,8 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu 
    public static final int ACTIVITY_TYPE_RECENTS = 3;

    /** Assistant activity type. */

    public static final int ACTIVITY_TYPE_ASSISTANT = 4;

    /** Dream activity type. */

    public static final int ACTIVITY_TYPE_DREAM = 5;



    /** @hide */

    @IntDef(prefix = { "ACTIVITY_TYPE_" }, value = {
@@ -149,6 +151,7 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu 
            ACTIVITY_TYPE_HOME,

            ACTIVITY_TYPE_RECENTS,

            ACTIVITY_TYPE_ASSISTANT,

            ACTIVITY_TYPE_DREAM,

    })

    public @interface ActivityType {}
@@ -746,9 +749,11 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu 
     * @hide

     */

    public boolean isAlwaysOnTop() {

        return mWindowingMode == WINDOWING_MODE_PINNED || (mAlwaysOnTop == ALWAYS_ON_TOP_ON

                && (mWindowingMode == WINDOWING_MODE_FREEFORM

                    || mWindowingMode == WINDOWING_MODE_MULTI_WINDOW));

        if (mWindowingMode == WINDOWING_MODE_PINNED) return true;

        if (mActivityType == ACTIVITY_TYPE_DREAM) return true;

        if (mAlwaysOnTop != ALWAYS_ON_TOP_ON) return false;

        return mWindowingMode == WINDOWING_MODE_FREEFORM

                    || mWindowingMode == WINDOWING_MODE_MULTI_WINDOW;

    }



    /**
@@ -798,7 +803,7 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu 


    /** @hide */

    public static boolean supportSplitScreenWindowingMode(int activityType) {

        return activityType != ACTIVITY_TYPE_ASSISTANT;

        return activityType != ACTIVITY_TYPE_ASSISTANT && activityType != ACTIVITY_TYPE_DREAM;

    }



    /** @hide */
@@ -823,6 +828,7 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu 
            case ACTIVITY_TYPE_HOME: return "home";

            case ACTIVITY_TYPE_RECENTS: return "recents";

            case ACTIVITY_TYPE_ASSISTANT: return "assistant";

            case ACTIVITY_TYPE_DREAM: return "dream";

        }

        return String.valueOf(applicationType);

    }

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

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import static android.app.ActivityManager.LOCK_TASK_MODE_NONE; 
import static android.app.ActivityManagerInternal.ALLOW_NON_FULL;

import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.app.ActivityTaskManager.RESIZE_MODE_PRESERVE_WINDOW;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_DREAM;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;

import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
@@ -1273,9 +1274,13 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        a.colorMode = ActivityInfo.COLOR_MODE_DEFAULT;

        a.flags |= ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS;



        final ActivityOptions options = ActivityOptions.makeBasic();

        options.setLaunchActivityType(ACTIVITY_TYPE_DREAM);



        try {

            getActivityStartController().obtainStarter(intent, "dream")

                    .setActivityInfo(a)

                    .setActivityOptions(options.toBundle())

                    .setIsDream(true)

                    .execute();

            return true;

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

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



import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_DREAM;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
@@ -467,6 +468,10 @@ public abstract class ConfigurationContainer<E extends ConfigurationContainer> { 
        return getActivityType() == ACTIVITY_TYPE_ASSISTANT;

    }



    public boolean isActivityTypeDream() {

        return getActivityType() == ACTIVITY_TYPE_DREAM;

    }



    public boolean isActivityTypeStandard() {

        return getActivityType() == ACTIVITY_TYPE_STANDARD;

    }

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

+4 −0
Original line number Diff line number Diff line
@@ -4493,6 +4493,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
         */

        private int findPositionForStack(int requestedPosition, ActivityStack stack,

                boolean adding) {

            if (stack.isActivityTypeDream()) {

                return POSITION_TOP;

            }



            if (stack.inPinnedWindowingMode()) {

                return POSITION_TOP;

            }