Merge "Have bubble bar unstash gesture track finger" into main
This commit is contained in:
@@ -108,6 +108,7 @@ import com.android.launcher3.taskbar.TaskbarTranslationController.TransitionCall
|
||||
import com.android.launcher3.taskbar.allapps.TaskbarAllAppsController;
|
||||
import com.android.launcher3.taskbar.bubbles.BubbleBarController;
|
||||
import com.android.launcher3.taskbar.bubbles.BubbleBarPinController;
|
||||
import com.android.launcher3.taskbar.bubbles.BubbleBarSwipeController;
|
||||
import com.android.launcher3.taskbar.bubbles.BubbleBarView;
|
||||
import com.android.launcher3.taskbar.bubbles.BubbleBarViewController;
|
||||
import com.android.launcher3.taskbar.bubbles.BubbleControllers;
|
||||
@@ -279,9 +280,11 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
|
||||
BubbleBarController.onTaskbarRecreated();
|
||||
if (BubbleBarController.isBubbleBarEnabled() && bubbleBarView != null) {
|
||||
Optional<BubbleStashedHandleViewController> bubbleHandleController = Optional.empty();
|
||||
Optional<BubbleBarSwipeController> bubbleBarSwipeController = Optional.empty();
|
||||
if (isTransientTaskbar) {
|
||||
bubbleHandleController = Optional.of(
|
||||
new BubbleStashedHandleViewController(this, bubbleHandleView));
|
||||
bubbleBarSwipeController = Optional.of(new BubbleBarSwipeController(this));
|
||||
}
|
||||
TaskbarHotseatDimensionsProvider dimensionsProvider =
|
||||
new DeviceProfileDimensionsProviderAdapter(this);
|
||||
@@ -299,6 +302,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
|
||||
() -> DisplayController.INSTANCE.get(this).getInfo().currentSize),
|
||||
new BubblePinController(this, mDragLayer,
|
||||
() -> DisplayController.INSTANCE.get(this).getInfo().currentSize),
|
||||
bubbleBarSwipeController,
|
||||
new BubbleCreator(this)
|
||||
));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user