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

Commit 46640231 authored by Yuncheol Heo's avatar Yuncheol Heo
Browse files

Move setTaskAlwaysOnTop from TaskView to BubbleExpandedView. 

Bug: 178212126
Bug: 175918200
Test: [Car] launch Dialer and check Dialer button is highlighted.
Test: [Phone] launch DetailDialog and check Navigation bar.
Change-Id: Ic10dca7e25a8828f8da36130ec78d2e24c765609
parent cbb25bcf

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
@@ -137,6 +137,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