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

Commit 72df830a authored by Liran Binyamin's avatar Liran Binyamin
Browse files

Use the same TaskViewTransitions in Bubbles 

Previously BubbleController created its own instance of
TaskViewTransitions, while BubbleTransitions used a different
instance. This change moves the creation of the TaskViewTransitions
instance used in Bubbles to dagger and passes it into other Bubbles
classes.

Flag: EXEMPT bugfix
Bug: 392893178
Test: treehugger
Change-Id: Ie424b8d94f06f2a73a85c1bb5437986f60331332
parent 6eaccc02

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

+0 −2
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ import com.android.wm.shell.shared.bubbles.DeviceConfig 
import com.android.wm.shell.sysui.ShellCommandHandler

import com.android.wm.shell.sysui.ShellController

import com.android.wm.shell.sysui.ShellInit

import com.android.wm.shell.taskview.TaskViewRepository

import com.android.wm.shell.taskview.TaskViewTransitions

import com.android.wm.shell.transition.Transitions

import com.google.common.truth.Truth.assertThat
@@ -285,7 +284,6 @@ class BubbleControllerBubbleBarTest { 
            mainExecutor,

            mock<Handler>(),

            bgExecutor,

            mock<TaskViewRepository>(),

            mock<TaskViewTransitions>(),

            mock<Transitions>(),

            SyncTransactionQueue(TransactionPool(), mainExecutor),

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

+0 −2
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ import com.android.wm.shell.shared.bubbles.BubbleAnythingFlagHelper 
import com.android.wm.shell.sysui.ShellCommandHandler

import com.android.wm.shell.sysui.ShellController

import com.android.wm.shell.sysui.ShellInit

import com.android.wm.shell.taskview.TaskViewRepository

import com.android.wm.shell.taskview.TaskViewTaskController

import com.android.wm.shell.taskview.TaskViewTransitions

import com.android.wm.shell.transition.Transitions
@@ -407,7 +406,6 @@ class BubbleControllerTest(flags: FlagsParameterization) { 
                mainExecutor,

                mock<Handler>(),

                bgExecutor,

                mock<TaskViewRepository>(),

                mock<TaskViewTransitions>(),

                mock<Transitions>(),

                SyncTransactionQueue(TransactionPool(), mainExecutor),

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

+0 −2
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import com.android.wm.shell.sysui.ShellCommandHandler 
import com.android.wm.shell.sysui.ShellController

import com.android.wm.shell.sysui.ShellInit

import com.android.wm.shell.taskview.TaskView

import com.android.wm.shell.taskview.TaskViewRepository

import com.android.wm.shell.taskview.TaskViewTransitions

import com.android.wm.shell.transition.Transitions

import com.google.common.truth.Truth.assertThat
@@ -158,7 +157,6 @@ class BubbleViewInfoTaskTest { 
                mainExecutor,

                mock<Handler>(),

                bgExecutor,

                mock<TaskViewRepository>(),

                mock<TaskViewTransitions>(),

                mock<Transitions>(),

                SyncTransactionQueue(TransactionPool(), mainExecutor),

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

+0 −2
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ import com.android.wm.shell.shared.bubbles.DraggedObject 
import com.android.wm.shell.sysui.ShellCommandHandler

import com.android.wm.shell.sysui.ShellController

import com.android.wm.shell.sysui.ShellInit

import com.android.wm.shell.taskview.TaskViewRepository

import com.android.wm.shell.taskview.TaskViewTransitions

import com.android.wm.shell.transition.Transitions

import com.google.common.truth.Truth.assertThat
@@ -240,7 +239,6 @@ class BubbleBarLayerViewTest { 
            mainExecutor,

            mock<Handler>(),

            bgExecutor,

            mock<TaskViewRepository>(),

            mock<TaskViewTransitions>(),

            mock<Transitions>(),

            SyncTransactionQueue(TransactionPool(), mainExecutor),

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

+1 −12
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ import com.android.wm.shell.sysui.ShellController; 
import com.android.wm.shell.sysui.ShellInit;

import com.android.wm.shell.taskview.TaskView;

import com.android.wm.shell.taskview.TaskViewController;

import com.android.wm.shell.taskview.TaskViewRepository;

import com.android.wm.shell.taskview.TaskViewTaskController;

import com.android.wm.shell.taskview.TaskViewTransitions;

import com.android.wm.shell.transition.Transitions;
@@ -213,7 +212,6 @@ public class BubbleController implements ConfigurationChangeListener, 
    private final DisplayController mDisplayController;

    private final TaskViewController mTaskViewController;

    private final Transitions mTransitions;

    private final SyncTransactionQueue mSyncQueue;

    private final ShellController mShellController;

    private final ShellCommandHandler mShellCommandHandler;

    private final IWindowManager mWmService;
@@ -335,7 +333,6 @@ public class BubbleController implements ConfigurationChangeListener, 
            @ShellMainThread ShellExecutor mainExecutor,

            @ShellMainThread Handler mainHandler,

            @ShellBackgroundThread ShellExecutor bgExecutor,

            TaskViewRepository taskViewRepository,

            @NonNull TaskViewTransitions taskViewTransitions,

            Transitions transitions,

            SyncTransactionQueue syncQueue,
@@ -375,18 +372,10 @@ public class BubbleController implements ConfigurationChangeListener, 
                context.getResources().getDimensionPixelSize(

                        com.android.internal.R.dimen.importance_ring_stroke_width));

        mDisplayController = displayController;

        final TaskViewTransitions tvTransitions;

        if (TaskViewTransitions.useRepo()) {

            tvTransitions = new TaskViewTransitions(transitions, taskViewRepository, organizer,

                    syncQueue);

        } else {

            tvTransitions = taskViewTransitions;

        }

        mTaskViewController = new BubbleTaskViewController(tvTransitions);

        mTaskViewController = new BubbleTaskViewController(taskViewTransitions);

        mTransitions = transitions;

        mOneHandedOptional = oneHandedOptional;

        mDragAndDropController = dragAndDropController;

        mSyncQueue = syncQueue;

        mWmService = wmService;

        mBubbleTransitions = bubbleTransitions;

        mBubbleTransitions.setBubbleController(this);