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

Commit 06200523 authored by Winson Chung's avatar Winson Chung
Browse files

Move always-on-top to the callers 

- This was accidentally included in ag/10788780, where only the bubbles
  AV should be using an always-on-top MW task

Bug: 152808872
Test: Start auto in emulator and ensure the task is not always on top

Change-Id: If0de9d5856b15dbca7661bf97a88b10fd63ec9db
parent 27480cf8

core/java/android/window/VirtualDisplayTaskEmbedder.java

+0 −1
Original line number Diff line number Diff line
@@ -248,7 +248,6 @@ public class VirtualDisplayTaskEmbedder extends TaskEmbedder { 
        options = super.prepareActivityOptions(options);

        options.setLaunchDisplayId(getDisplayId());

        options.setLaunchWindowingMode(WINDOWING_MODE_MULTI_WINDOW);

        options.setTaskAlwaysOnTop(true);

        return options;

    }

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ public class BubbleExpandedView extends LinearLayout implements View.OnClickList 
                    // Custom options so there is no activity transition animation

                    ActivityOptions options = ActivityOptions.makeCustomAnimation(getContext(),

                            0 /* enterResId */, 0 /* exitResId */);

                    options.setTaskAlwaysOnTop(true);

                    // Post to keep the lifecycle normal

                    post(() -> {

                        if (DEBUG_BUBBLE_EXPANDED_VIEW) {