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

Commit 8347163d authored by Winson Chung's avatar Winson Chung
Browse files

Create a new stack for the assistant activity. 

- Add a new stack that is not resized with multiwindow, and
  appears above the fullscreen and docked stacks, but below
  the pinned stack
- Add a method on VoiceInteractionSession to allow the assistant
  to launch activities into this new fullscreen stack.
- Also prevent any activities in the assist stack from the
  fetching of the on screen assist data.

Bug: 30999386
Test: android.server.cts.ActivityManagerAssistantStackTests

Change-Id: I22ab7629b5f758cf1e66d7d1c26648af6bc887c9
parent 5b12734f

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -36786,6 +36786,7 @@ package android.service.voice { 
    method public void setTheme(int);

    method public void setTheme(int);

    method public void setUiEnabled(boolean);

    method public void setUiEnabled(boolean);

    method public void show(android.os.Bundle, int);

    method public void show(android.os.Bundle, int);

    method public void startAssistantActivity(android.content.Intent);

    method public void startVoiceActivity(android.content.Intent);

    method public void startVoiceActivity(android.content.Intent);

    field public static final int SHOW_SOURCE_ACTIVITY = 16; // 0x10

    field public static final int SHOW_SOURCE_ACTIVITY = 16; // 0x10

    field public static final int SHOW_SOURCE_APPLICATION = 8; // 0x8

    field public static final int SHOW_SOURCE_APPLICATION = 8; // 0x8

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -39904,6 +39904,7 @@ package android.service.voice { 
    method public void setTheme(int);

    method public void setTheme(int);

    method public void setUiEnabled(boolean);

    method public void setUiEnabled(boolean);

    method public void show(android.os.Bundle, int);

    method public void show(android.os.Bundle, int);

    method public void startAssistantActivity(android.content.Intent);

    method public void startVoiceActivity(android.content.Intent);

    method public void startVoiceActivity(android.content.Intent);

    field public static final int SHOW_SOURCE_ACTIVITY = 16; // 0x10

    field public static final int SHOW_SOURCE_ACTIVITY = 16; // 0x10

    field public static final int SHOW_SOURCE_APPLICATION = 8; // 0x8

    field public static final int SHOW_SOURCE_APPLICATION = 8; // 0x8

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -36921,6 +36921,7 @@ package android.service.voice { 
    method public void setTheme(int);

    method public void setTheme(int);

    method public void setUiEnabled(boolean);

    method public void setUiEnabled(boolean);

    method public void show(android.os.Bundle, int);

    method public void show(android.os.Bundle, int);

    method public void startAssistantActivity(android.content.Intent);

    method public void startVoiceActivity(android.content.Intent);

    method public void startVoiceActivity(android.content.Intent);

    field public static final int SHOW_SOURCE_ACTIVITY = 16; // 0x10

    field public static final int SHOW_SOURCE_ACTIVITY = 16; // 0x10

    field public static final int SHOW_SOURCE_APPLICATION = 8; // 0x8

    field public static final int SHOW_SOURCE_APPLICATION = 8; // 0x8

core/java/android/app/ActivityManager.java

+50 −20
Original line number Original line Diff line number Diff line
@@ -616,11 +616,14 @@ public class ActivityManager { 
        /** ID of stack that always on top (always visible) when it exist. */

        /** ID of stack that always on top (always visible) when it exist. */

        public static final int PINNED_STACK_ID = DOCKED_STACK_ID + 1;

        public static final int PINNED_STACK_ID = DOCKED_STACK_ID + 1;





        /** Recents activity stack ID. */

        /** ID of stack that contains the Recents activity. */

        public static final int RECENTS_STACK_ID = PINNED_STACK_ID + 1;

        public static final int RECENTS_STACK_ID = PINNED_STACK_ID + 1;





        /** ID of stack that contains activities launched by the assistant. */

        public static final int ASSISTANT_STACK_ID = RECENTS_STACK_ID + 1;



        /** Last static stack stack ID. */

        /** Last static stack stack ID. */

        public static final int LAST_STATIC_STACK_ID = RECENTS_STACK_ID;

        public static final int LAST_STATIC_STACK_ID = ASSISTANT_STACK_ID;





        /** Start of ID range used by stacks that are created dynamically. */

        /** Start of ID range used by stacks that are created dynamically. */

        public static final int FIRST_DYNAMIC_STACK_ID = LAST_STATIC_STACK_ID + 1;

        public static final int FIRST_DYNAMIC_STACK_ID = LAST_STATIC_STACK_ID + 1;
@@ -665,7 +668,7 @@ public class ActivityManager { 
         * Returns true if dynamic stacks are allowed to be visible behind the input stack.

         * Returns true if dynamic stacks are allowed to be visible behind the input stack.

         */

         */

        public static boolean isDynamicStacksVisibleBehindAllowed(int stackId) {

        public static boolean isDynamicStacksVisibleBehindAllowed(int stackId) {

            return stackId == PINNED_STACK_ID;

            return stackId == PINNED_STACK_ID || stackId == ASSISTANT_STACK_ID;

        }

        }





        /**

        /**
@@ -681,8 +684,8 @@ public class ActivityManager { 
         * Returns true if Stack size is affected by the docked stack changing size.

         * Returns true if Stack size is affected by the docked stack changing size.

         */

         */

        public static boolean isResizeableByDockedStack(int stackId) {

        public static boolean isResizeableByDockedStack(int stackId) {

            return isStaticStack(stackId) &&

            return isStaticStack(stackId) && stackId != DOCKED_STACK_ID

                    stackId != DOCKED_STACK_ID && stackId != PINNED_STACK_ID;

                    && stackId != PINNED_STACK_ID && stackId != ASSISTANT_STACK_ID;

        }

        }





        /**

        /**
@@ -691,14 +694,16 @@ public class ActivityManager { 
         */

         */

        public static boolean isTaskResizeableByDockedStack(int stackId) {

        public static boolean isTaskResizeableByDockedStack(int stackId) {

            return isStaticStack(stackId) && stackId != FREEFORM_WORKSPACE_STACK_ID

            return isStaticStack(stackId) && stackId != FREEFORM_WORKSPACE_STACK_ID

                    && stackId != DOCKED_STACK_ID && stackId != PINNED_STACK_ID;

                    && stackId != DOCKED_STACK_ID && stackId != PINNED_STACK_ID

                    && stackId != ASSISTANT_STACK_ID;

        }

        }





        /**

        /**

         * Returns true if the input stack is affected by drag resizing.

         * Returns true if the input stack is affected by drag resizing.

         */

         */

        public static boolean isStackAffectedByDragResizing(int stackId) {

        public static boolean isStackAffectedByDragResizing(int stackId) {

            return isStaticStack(stackId) && stackId != PINNED_STACK_ID;

            return isStaticStack(stackId) && stackId != PINNED_STACK_ID

                    && stackId != ASSISTANT_STACK_ID;

        }

        }





        /**

        /**
@@ -721,20 +726,32 @@ public class ActivityManager { 
                || stackId == PINNED_STACK_ID;

                || stackId == PINNED_STACK_ID;

        }

        }





        /**

         * Return whether a stackId is a stack that be a backdrop to a translucent activity.  These

         * are generally fullscreen stacks.

         */

        public static boolean isBackdropToTranslucentActivity(int stackId) {

            return stackId == FULLSCREEN_WORKSPACE_STACK_ID

                    || stackId == ASSISTANT_STACK_ID;

        }



        /**

        /**

         * Returns true if animation specs should be constructed for app transition that moves

         * Returns true if animation specs should be constructed for app transition that moves

         * the task to the specified stack.

         * the task to the specified stack.

         */

         */

        public static boolean useAnimationSpecForAppTransition(int stackId) {

        public static boolean useAnimationSpecForAppTransition(int stackId) {



            // TODO: INVALID_STACK_ID is also animated because we don't persist stack id's across

            // TODO: INVALID_STACK_ID is also animated because we don't persist stack id's across

            // reboots.

            // reboots.

            return stackId == FREEFORM_WORKSPACE_STACK_ID

            return stackId == FREEFORM_WORKSPACE_STACK_ID

                    || stackId == FULLSCREEN_WORKSPACE_STACK_ID || stackId == DOCKED_STACK_ID

                    || stackId == FULLSCREEN_WORKSPACE_STACK_ID

                    || stackId == ASSISTANT_STACK_ID

                    || stackId == DOCKED_STACK_ID

                    || stackId == INVALID_STACK_ID;

                    || stackId == INVALID_STACK_ID;

        }

        }





        /** Returns true if the windows in the stack can receive input keys. */

        /**

         * Returns true if the windows in the stack can receive input keys.

         */

        public static boolean canReceiveKeys(int stackId) {

        public static boolean canReceiveKeys(int stackId) {

            return stackId != PINNED_STACK_ID;

            return stackId != PINNED_STACK_ID;

        }

        }
@@ -743,7 +760,17 @@ public class ActivityManager { 
         * Returns true if the stack can be visible above lockscreen.

         * Returns true if the stack can be visible above lockscreen.

         */

         */

        public static boolean isAllowedOverLockscreen(int stackId) {

        public static boolean isAllowedOverLockscreen(int stackId) {

            return stackId == HOME_STACK_ID || stackId == FULLSCREEN_WORKSPACE_STACK_ID;

            return stackId == HOME_STACK_ID || stackId == FULLSCREEN_WORKSPACE_STACK_ID ||

                    stackId == ASSISTANT_STACK_ID;

        }



        /**

         * Returns true if activities from stasks in the given {@param stackId} are allowed to

         * enter picture-in-picture.

         */

        public static boolean isAllowedToEnterPictureInPicture(int stackId) {

            return stackId != HOME_STACK_ID && stackId != ASSISTANT_STACK_ID &&

                    stackId != RECENTS_STACK_ID;

        }

        }





        public static boolean isAlwaysOnTop(int stackId) {

        public static boolean isAlwaysOnTop(int stackId) {
@@ -799,8 +826,8 @@ public class ActivityManager { 
         * @see android.app.ActivityManager#supportsMultiWindow

         * @see android.app.ActivityManager#supportsMultiWindow

         */

         */

        public static boolean isMultiWindowStack(int stackId) {

        public static boolean isMultiWindowStack(int stackId) {

            return isStaticStack(stackId) || stackId == PINNED_STACK_ID

            return stackId == PINNED_STACK_ID || stackId == FREEFORM_WORKSPACE_STACK_ID

                    || stackId == FREEFORM_WORKSPACE_STACK_ID || stackId == DOCKED_STACK_ID;

                    || stackId == DOCKED_STACK_ID;

        }

        }





        /**

        /**
@@ -815,20 +842,20 @@ public class ActivityManager { 
         * calling {@link Activity#requestVisibleBehind}.

         * calling {@link Activity#requestVisibleBehind}.

         */

         */

        public static boolean activitiesCanRequestVisibleBehind(int stackId) {

        public static boolean activitiesCanRequestVisibleBehind(int stackId) {

            return stackId == FULLSCREEN_WORKSPACE_STACK_ID;

            return stackId == FULLSCREEN_WORKSPACE_STACK_ID ||

                    stackId == ASSISTANT_STACK_ID;

        }

        }





        /**

        /**

         * Returns true if this stack may be scaled without resizing,

         * Returns true if this stack may be scaled without resizing, and windows within may need

         * and windows within may need to be configured as such.

         * to be configured as such.

         */

         */

        public static boolean windowsAreScaleable(int stackId) {

        public static boolean windowsAreScaleable(int stackId) {

            return stackId == PINNED_STACK_ID;

            return stackId == PINNED_STACK_ID;

        }

        }





        /**

        /**

         * Returns true if windows in this stack should be given move animations

         * Returns true if windows in this stack should be given move animations by default.

         * by default.

         */

         */

        public static boolean hasMovementAnimations(int stackId) {

        public static boolean hasMovementAnimations(int stackId) {

            return stackId != PINNED_STACK_ID;

            return stackId != PINNED_STACK_ID;
@@ -836,8 +863,11 @@ public class ActivityManager { 




        /** Returns true if the input stack and its content can affect the device orientation. */

        /** Returns true if the input stack and its content can affect the device orientation. */

        public static boolean canSpecifyOrientation(int stackId) {

        public static boolean canSpecifyOrientation(int stackId) {

            return stackId == HOME_STACK_ID || stackId == RECENTS_STACK_ID

            return stackId == HOME_STACK_ID

                    || stackId == FULLSCREEN_WORKSPACE_STACK_ID || isDynamicStack(stackId);

                    || stackId == RECENTS_STACK_ID

                    || stackId == FULLSCREEN_WORKSPACE_STACK_ID

                    || stackId == ASSISTANT_STACK_ID

                    || isDynamicStack(stackId);

        }

        }

    }

    }

core/java/android/app/IActivityManager.aidl

+2 −0
Original line number Original line Diff line number Diff line
@@ -389,6 +389,8 @@ interface IActivityManager { 
            in Intent intent, in String resolvedType, in IVoiceInteractionSession session,

            in Intent intent, in String resolvedType, in IVoiceInteractionSession session,

            in IVoiceInteractor interactor, int flags, in ProfilerInfo profilerInfo,

            in IVoiceInteractor interactor, int flags, in ProfilerInfo profilerInfo,

            in Bundle options, int userId);

            in Bundle options, int userId);

    int startAssistantActivity(in String callingPackage, int callingPid, int callingUid,

            in Intent intent, in String resolvedType, in Bundle options, int userId);

    Bundle getActivityOptions(in IBinder token);

    Bundle getActivityOptions(in IBinder token);

    List<IBinder> getAppTasks(in String callingPackage);

    List<IBinder> getAppTasks(in String callingPackage);

    void startSystemLockTaskMode(int taskId);

    void startSystemLockTaskMode(int taskId);