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

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

Merge "Fix TransitionTests#testFlagFillsTask_openActivityFillingTask" into... 

Merge "Fix TransitionTests#testFlagFillsTask_openActivityFillingTask" into tm-qpr-dev am: 58b37f9a am: 07131f87

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



Change-Id: I607509f0e48a807c97b047c833a69993296bca5d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 84edd5e4 07131f87

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

+3 −10
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server.wm; 
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

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

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

import static android.view.WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS;
@@ -1232,10 +1231,8 @@ public class TransitionTests extends WindowTestsBase { 
        final ArraySet<WindowContainer> participants = transition.mParticipants;



        final Task task = createTask(mDisplayContent);

        // Set to multi-windowing mode in order to set bounds.

        task.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);

        final Rect taskBounds = new Rect(0, 0, 500, 1000);

        task.setBounds(taskBounds);

        task.getConfiguration().windowConfiguration.setBounds(taskBounds);

        final ActivityRecord nonEmbeddedActivity = createActivityRecord(task);

        final TaskFragmentOrganizer organizer = new TaskFragmentOrganizer(Runnable::run);

        mAtm.mTaskFragmentOrganizerController.registerOrganizer(
@@ -1277,10 +1274,8 @@ public class TransitionTests extends WindowTestsBase { 
        final ArraySet<WindowContainer> participants = transition.mParticipants;



        final Task task = createTask(mDisplayContent);

        // Set to multi-windowing mode in order to set bounds.

        task.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);

        final Rect taskBounds = new Rect(0, 0, 500, 1000);

        task.setBounds(taskBounds);

        task.getConfiguration().windowConfiguration.setBounds(taskBounds);

        final ActivityRecord activity = createActivityRecord(task);

        // Start states: set bounds to make sure the start bounds is ignored if it is not visible.

        activity.getConfiguration().windowConfiguration.setBounds(new Rect(0, 0, 250, 500));
@@ -1308,10 +1303,8 @@ public class TransitionTests extends WindowTestsBase { 
        final ArraySet<WindowContainer> participants = transition.mParticipants;



        final Task task = createTask(mDisplayContent);

        // Set to multi-windowing mode in order to set bounds.

        task.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);

        final Rect taskBounds = new Rect(0, 0, 500, 1000);

        task.setBounds(taskBounds);

        task.getConfiguration().windowConfiguration.setBounds(taskBounds);

        final ActivityRecord activity = createActivityRecord(task);

        // Start states: fills Task without override.

        activity.mVisibleRequested = true;