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

Commit 4ede3e0d authored by Andrii Kulian's avatar Andrii Kulian
Browse files

Add unit tests for 180 degree rotation 

These tests if an app window token reports resize when device is
rotated from landscape to seascape.
There is also some additional plumbing to be able to perform a
rotation in unit test. Also dynamic stacks are now allowed to
influence the orientation of the device.

Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests
Bug: 33607506
Change-Id: I7b23e2de48d56c9fe485eae6a165378dbbbd08bb
parent 4391fae3

core/java/android/app/ActivityManager.java

+5 −1
Original line number Diff line number Diff line
@@ -628,6 +628,10 @@ public class ActivityManager { 
            return stackId >= FIRST_STATIC_STACK_ID && stackId <= LAST_STATIC_STACK_ID;

        }



        public static boolean isDynamicStack(int stackId) {

            return stackId >= FIRST_DYNAMIC_STACK_ID;

        }



        /**

         * Returns true if the activities contained in the input stack display a shadow around

         * their border.
@@ -825,7 +829,7 @@ public class ActivityManager { 
        /** Returns true if the input stack and its content can affect the device orientation. */

        public static boolean canSpecifyOrientation(int stackId) {

            return stackId == HOME_STACK_ID || stackId == RECENTS_STACK_ID

                    || stackId == FULLSCREEN_WORKSPACE_STACK_ID;

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

        }

    }

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+0 −1
Original line number Diff line number Diff line
@@ -1984,7 +1984,6 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
        if (!createStaticStackIfNeeded || !StackId.isStaticStack(stackId)) {

            return null;

        }

        // TODO(multi-display): Allow creating stacks on secondary displays.

        return createStackOnDisplay(stackId, DEFAULT_DISPLAY, createOnTop);

    }

services/core/java/com/android/server/am/ActivityStarter.java

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import static android.app.ActivityManager.StackId.HOME_STACK_ID; 
import static android.app.ActivityManager.StackId.INVALID_STACK_ID;

import static android.app.ActivityManager.StackId.PINNED_STACK_ID;

import static android.app.ActivityManager.StackId.RECENTS_STACK_ID;

import static android.app.ActivityManager.StackId.isStaticStack;

import static android.app.ActivityManager.StackId.isDynamicStack;

import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;

import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;

import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
@@ -1923,7 +1923,7 @@ class ActivityStarter { 
        final boolean canUseFocusedStack = focusedStackId == FULLSCREEN_WORKSPACE_STACK_ID

                || (focusedStackId == DOCKED_STACK_ID && r.canGoInDockedStack())

                || (focusedStackId == FREEFORM_WORKSPACE_STACK_ID && r.isResizeableOrForced())

                || !isStaticStack(focusedStackId);

                || isDynamicStack(focusedStackId);

        if (canUseFocusedStack && (!newTask

                || mSupervisor.mFocusedStack.mActivityContainer.isEligibleForNewTasks())) {

            if (DEBUG_FOCUS || DEBUG_STACK) Slog.d(TAG_FOCUS,
@@ -1935,7 +1935,7 @@ class ActivityStarter { 
        final ArrayList<ActivityStack> homeDisplayStacks = mSupervisor.mHomeStack.mStacks;

        for (int stackNdx = homeDisplayStacks.size() - 1; stackNdx >= 0; --stackNdx) {

            stack = homeDisplayStacks.get(stackNdx);

            if (!ActivityManager.StackId.isStaticStack(stack.mStackId)) {

            if (isDynamicStack(stack.mStackId)) {

                if (DEBUG_FOCUS || DEBUG_STACK) Slog.d(TAG_FOCUS,

                        "computeStackFocus: Setting focused stack=" + stack);

                return stack;

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

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> { 
            mService.configureDisplayPolicyLocked(dc);



            // TODO(multi-display): Create an input channel for each display with touch capability.

            if (displayId == DEFAULT_DISPLAY) {

            if (displayId == DEFAULT_DISPLAY && mService.canDispatchPointerEvents()) {

                dc.mTapDetector = new TaskTapPointerEventListener(

                        mService, dc);

                mService.registerPointerEventListener(dc.mTapDetector);

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

+6 −1
Original line number Diff line number Diff line
@@ -3404,6 +3404,11 @@ public class WindowManagerService extends IWindowManager.Stub 
        mPointerEventDispatcher.unregisterInputEventListener(listener);

    }



    /** Check if the service is set to dispatch pointer events. */

    boolean canDispatchPointerEvents() {

        return mPointerEventDispatcher != null;

    }



    // Called by window manager policy. Not exposed externally.

    @Override

    public int getLidState() {
@@ -4983,7 +4988,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        int keyboardPresence = 0;

        int navigationPresence = 0;

        final InputDevice[] devices = mInputManager.getInputDevices();

        final int len = devices.length;

        final int len = devices != null ? devices.length : 0;

        for (int i = 0; i < len; i++) {

            InputDevice device = devices[i];

            if (!device.isVirtual()) {