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

Commit 458bf06b authored by Ats Jenk's avatar Ats Jenk Committed by Android (Google) Code Review
Browse files

Merge changes Icd3bdc41,Idbe1ca91 into main 

* changes:
  Skip restoring task order when dragging to bubble
  Start launcher behind bubbled task
parents ee345f68 744cb09b

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleControllerBubbleBarTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.wm.shell.common.DisplayController 
import com.android.wm.shell.common.DisplayImeController

import com.android.wm.shell.common.DisplayInsetsController

import com.android.wm.shell.common.FloatingContentCoordinator

import com.android.wm.shell.common.HomeIntentProvider

import com.android.wm.shell.common.SyncTransactionQueue

import com.android.wm.shell.common.TaskStackListenerImpl

import com.android.wm.shell.common.TestShellExecutor
@@ -288,7 +289,8 @@ class BubbleControllerBubbleBarTest { 
            mock<Transitions>(),

            SyncTransactionQueue(TransactionPool(), mainExecutor),

            mock<IWindowManager>(),

            BubbleResizabilityChecker()

            BubbleResizabilityChecker(),

            HomeIntentProvider(context),

        )

    }

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleControllerTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import com.android.wm.shell.common.DisplayImeController 
import com.android.wm.shell.common.DisplayInsetsController

import com.android.wm.shell.common.DisplayLayout

import com.android.wm.shell.common.FloatingContentCoordinator

import com.android.wm.shell.common.HomeIntentProvider

import com.android.wm.shell.common.ImeListener

import com.android.wm.shell.common.SyncTransactionQueue

import com.android.wm.shell.common.TaskStackListenerImpl
@@ -382,6 +383,7 @@ class BubbleControllerTest(flags: FlagsParameterization) { 
                SyncTransactionQueue(TransactionPool(), mainExecutor),

                mock<IWindowManager>(),

                resizeChecker,

                HomeIntentProvider(context),

            )

        bubbleController.setInflateSynchronously(true)

        bubbleController.onInit()

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleViewInfoTaskTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.wm.shell.common.DisplayController 
import com.android.wm.shell.common.DisplayImeController

import com.android.wm.shell.common.DisplayInsetsController

import com.android.wm.shell.common.FloatingContentCoordinator

import com.android.wm.shell.common.HomeIntentProvider

import com.android.wm.shell.common.SyncTransactionQueue

import com.android.wm.shell.common.TaskStackListenerImpl

import com.android.wm.shell.common.TestShellExecutor
@@ -161,7 +162,8 @@ class BubbleViewInfoTaskTest { 
                mock<Transitions>(),

                SyncTransactionQueue(TransactionPool(), mainExecutor),

                mock<IWindowManager>(),

                BubbleResizabilityChecker()

                BubbleResizabilityChecker(),

                HomeIntentProvider(context),

            )



        // TODO: (b/371829099) - when optional overflow is no longer flagged we can enable this

libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerViewTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ import com.android.wm.shell.common.DisplayController 
import com.android.wm.shell.common.DisplayImeController

import com.android.wm.shell.common.DisplayInsetsController

import com.android.wm.shell.common.FloatingContentCoordinator

import com.android.wm.shell.common.HomeIntentProvider

import com.android.wm.shell.common.SyncTransactionQueue

import com.android.wm.shell.common.TaskStackListenerImpl

import com.android.wm.shell.common.TestShellExecutor
@@ -232,7 +233,8 @@ class BubbleBarLayerViewTest { 
            mock<Transitions>(),

            SyncTransactionQueue(TransactionPool(), mainExecutor),

            mock<IWindowManager>(),

            BubbleResizabilityChecker()

            BubbleResizabilityChecker(),

            HomeIntentProvider(context),

        )

    }

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

+6 −7
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static android.service.notification.NotificationListenerService.REASON_CA 
import static android.view.View.INVISIBLE;

import static android.view.View.VISIBLE;

import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

import static android.view.WindowManager.TRANSIT_CHANGE;



import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_BUBBLES;

import static com.android.wm.shell.bubbles.BubbleDebugConfig.TAG_WITH_CLASS_NAME;
@@ -104,6 +103,7 @@ import com.android.wm.shell.common.DisplayImeController; 
import com.android.wm.shell.common.DisplayInsetsController;

import com.android.wm.shell.common.ExternalInterfaceBinder;

import com.android.wm.shell.common.FloatingContentCoordinator;

import com.android.wm.shell.common.HomeIntentProvider;

import com.android.wm.shell.common.ImeListener;

import com.android.wm.shell.common.RemoteCallable;

import com.android.wm.shell.common.ShellExecutor;
@@ -216,6 +216,7 @@ public class BubbleController implements ConfigurationChangeListener, 
    private final BubbleTaskViewFactory mBubbleTaskViewFactory;

    private final BubbleExpandedViewManager mExpandedViewManager;

    private final ResizabilityChecker mResizabilityChecker;

    private final HomeIntentProvider mHomeIntentProvider;



    // Used to post to main UI thread

    private final ShellExecutor mMainExecutor;
@@ -331,7 +332,8 @@ public class BubbleController implements ConfigurationChangeListener, 
            Transitions transitions,

            SyncTransactionQueue syncQueue,

            IWindowManager wmService,

            ResizabilityChecker resizabilityChecker) {

            ResizabilityChecker resizabilityChecker,

            HomeIntentProvider homeIntentProvider) {

        mContext = context;

        mShellCommandHandler = shellCommandHandler;

        mShellController = shellController;
@@ -393,6 +395,7 @@ public class BubbleController implements ConfigurationChangeListener, 
        };

        mExpandedViewManager = BubbleExpandedViewManager.fromBubbleController(this);

        mResizabilityChecker = resizabilityChecker;

        mHomeIntentProvider = homeIntentProvider;

    }



    private void registerOneHandedState(OneHandedController oneHanded) {
@@ -1609,10 +1612,6 @@ public class BubbleController implements ConfigurationChangeListener, 
        }

        if (b.isInflated()) {

            mBubbleData.setSelectedBubbleAndExpandStack(b, location);

            if (dragData != null && dragData.getPendingWct() != null) {

                mTransitions.startTransition(TRANSIT_CHANGE,

                        dragData.getPendingWct(), /* handler= */ null);

            }

        } else {

            if (location != null) {

                setBubbleBarLocation(location, UpdateSource.DRAG_TASK);
@@ -1622,7 +1621,7 @@ public class BubbleController implements ConfigurationChangeListener, 
            ensureBubbleViewsAndWindowCreated();

            mBubbleTransitions.startConvertToBubble(b, taskInfo, mExpandedViewManager,

                    mBubbleTaskViewFactory, mBubblePositioner, mStackView, mLayerView,

                    mBubbleIconFactory, dragData, mInflateSynchronously);

                    mBubbleIconFactory, mHomeIntentProvider, dragData, mInflateSynchronously);

        }

    }