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

Commit f2723bd1 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Remove forcing wallpaper visible for freeform task" into main

parents 20acaee2 fde7df6a

core/java/android/window/flags/windowing_frontend.aconfig

+11 −0
Original line number Diff line number Diff line
@@ -139,6 +139,17 @@ flag { 
  }

}



flag {

  name: "do_not_force_wallpaper_for_freeform_task"

  namespace: "windowing_frontend"

  description: "Remove legacy condition to reduce overhead"

  bug: "433694978"

  is_fixed_read_only: true

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "bg_priority_for_occluded_freeform_tasks"

  namespace: "windowing_frontend"

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

+2 −1
Original line number Diff line number Diff line
@@ -676,7 +676,8 @@ class WallpaperController { 


    private void findWallpaperTarget() {

        mFindResults.reset();

        if (mService.mAtmService.mSupportsFreeformWindowManagement

        if (!com.android.window.flags.Flags.doNotForceWallpaperForFreeformTask()

                && mService.mAtmService.mSupportsFreeformWindowManagement

                && mDisplayContent.getDefaultTaskDisplayArea()

                .isRootTaskVisible(WINDOWING_MODE_FREEFORM)) {

            // In freeform mode we set the wallpaper as its own target, so we don't need an

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

+0 −5
Original line number Diff line number Diff line
@@ -1067,18 +1067,13 @@ public class DisplayContentTests extends WindowTestsBase { 
                .setDisplay(dc)

                .setCreateActivity(true)

                .build();

        doReturn(true).when(rootTask).isVisible();



        final Task freeformRootTask = new TaskBuilder(mSupervisor)

                .setDisplay(dc)

                .setCreateActivity(true)

                .setWindowingMode(WINDOWING_MODE_FREEFORM)

                .build();

        doReturn(true).when(freeformRootTask).isVisible();

        freeformRootTask.getTopChild().setBounds(100, 100, 300, 400);



        assertTrue(dc.getDefaultTaskDisplayArea().isRootTaskVisible(WINDOWING_MODE_FREEFORM));



        freeformRootTask.getTopNonFinishingActivity().setOrientation(SCREEN_ORIENTATION_LANDSCAPE);

        rootTask.getTopNonFinishingActivity().setOrientation(SCREEN_ORIENTATION_PORTRAIT);

        assertEquals(SCREEN_ORIENTATION_PORTRAIT, dc.getOrientation());