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

Commit 857ebd3c authored by Yuncheol Heo's avatar Yuncheol Heo Committed by Android (Google) Code Review
Browse files

Merge "Move setTaskAlwaysOnTop from TaskView to BubbleExpandedView."

parents 8b1a4d8c 46640231

libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback, 
        });

        options.setLaunchCookie(launchCookie);

        options.setLaunchWindowingMode(WINDOWING_MODE_MULTI_WINDOW);

        options.setTaskAlwaysOnTop(true);

    }



    /**

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ public class BubbleExpandedView extends LinearLayout { 
                            + getBubbleKey());

                }

                try {

                    options.setTaskAlwaysOnTop(true);

                    if (!mIsOverflow && mBubble.hasMetadataShortcutId()) {

                        options.setApplyActivityFlagsForBubbles(true);

                        mTaskView.startShortcutActivity(mBubble.getShortcutInfo(),

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/TaskViewTest.java

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ public class TaskViewTest extends ShellTestCase { 


        verify(mOrganizer).setPendingLaunchCookieListener(any(), eq(mTaskView));

        assertThat(options.getLaunchWindowingMode()).isEqualTo(WINDOWING_MODE_MULTI_WINDOW);

        assertThat(options.getTaskAlwaysOnTop()).isTrue();

    }



    @Test