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

Commit fa1e1bb2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix temporal display orientation by pip activity" into rvc-dev am: e9633837 

Change-Id: I3fa387c6db2876435ef2d375b0df0bf6d5b46f21
parents be9db0cc e9633837

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

+0 −15
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import static android.app.WindowConfiguration.windowingModeToString; 
import static android.content.pm.ActivityInfo.CONFIG_SCREEN_LAYOUT;

import static android.content.pm.ActivityInfo.FLAG_RESUME_WHILE_PAUSING;

import static android.content.pm.ActivityInfo.FLAG_SHOW_FOR_ALL_USERS;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;

import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.Display.FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD;
@@ -3781,20 +3780,6 @@ class ActivityStack extends Task { 
        return super.checkCompleteDeferredRemoval();

    }



    @Override

    int getOrientation() {

        return (canSpecifyOrientation()) ? super.getOrientation() : SCREEN_ORIENTATION_UNSET;

    }



    private boolean canSpecifyOrientation() {

        final int windowingMode = getWindowingMode();

        final int activityType = getActivityType();

        return windowingMode == WINDOWING_MODE_FULLSCREEN

                || activityType == ACTIVITY_TYPE_HOME

                || activityType == ACTIVITY_TYPE_RECENTS

                || activityType == ACTIVITY_TYPE_ASSISTANT;

    }



    public DisplayInfo getDisplayInfo() {

        return mDisplayContent.getDisplayInfo();

    }

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

+17 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ import static android.app.ActivityTaskManager.INVALID_TASK_ID; 
import static android.app.ActivityTaskManager.RESIZE_MODE_FORCED;

import static android.app.ActivityTaskManager.RESIZE_MODE_SYSTEM;

import static android.app.ActivityTaskManager.RESIZE_MODE_SYSTEM_SCREEN_ROTATION;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;

import static android.app.WindowConfiguration.PINNED_WINDOWING_MODE_ELEVATION_IN_DIP;
@@ -3202,6 +3205,20 @@ class Task extends WindowContainer<WindowContainer> { 
        return mTaskDescription;

    }



    @Override

    int getOrientation(int candidate) {

        return canSpecifyOrientation() ? super.getOrientation(candidate) : SCREEN_ORIENTATION_UNSET;

    }



    private boolean canSpecifyOrientation() {

        final int windowingMode = getWindowingMode();

        final int activityType = getActivityType();

        return windowingMode == WINDOWING_MODE_FULLSCREEN

                || activityType == ACTIVITY_TYPE_HOME

                || activityType == ACTIVITY_TYPE_RECENTS

                || activityType == ACTIVITY_TYPE_ASSISTANT;

    }



    @Override

    boolean fillsParent() {

        return matchParentBounds();

services/tests/wmtests/src/com/android/server/wm/TaskRecordTests.java

+15 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static android.content.Intent.FLAG_ACTIVITY_TASK_ON_HOME; 
import static android.content.pm.ActivityInfo.FLAG_RELINQUISH_TASK_IDENTITY;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;

import static android.util.DisplayMetrics.DENSITY_DEFAULT;

import static android.view.IWindowManager.FIXED_TO_USER_ROTATION_ENABLED;
@@ -939,6 +940,20 @@ public class TaskRecordTests extends ActivityTestsBase { 
        verify(persister, never()).saveTask(same(task), any());

    }



    @Test

    public void testNotSpecifyOrientationByFloatingTask() {

        final Task task = getTestTask();

        final ActivityRecord activity = task.getTopMostActivity();

        final WindowContainer<?> taskContainer = task.getParent();

        activity.setRequestedOrientation(SCREEN_ORIENTATION_LANDSCAPE);



        assertEquals(SCREEN_ORIENTATION_LANDSCAPE, taskContainer.getOrientation());



        task.setWindowingMode(WINDOWING_MODE_PINNED);



        assertEquals(SCREEN_ORIENTATION_UNSET, taskContainer.getOrientation());

    }



    private Task getTestTask() {

        final ActivityStack stack = new StackBuilder(mRootWindowContainer).build();

        return stack.getBottomMostTask();