fix: Conflict incoming changes from 15-dev
This commit is contained in:
1 parent
14e352c827
commit
2e76c99dad
1726 files changed
+146970
-95027
No files matched your search
@@ -132,7 +132,7 @@ public class TaskbarViewCallbacks {
|
||||
* Notifies launcher to update icon alignment.
|
||||
*/
|
||||
public void notifyIconLayoutBoundsChanged() {
|
||||
mControllers.uiController.onIconLayoutBoundsChanged();
|
||||
mControllers.taskbarViewController.notifyIconLayoutBoundsChanged();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -203,7 +203,7 @@ public class TaskbarViewCallbacks {
|
||||
mTaskbarView.getTaskbarOverflowView().getIsActive());
|
||||
}
|
||||
mControllers.keyboardQuickSwitchController.toggleQuickSwitchViewForTaskbar(
|
||||
mControllers.taskbarViewController.getTaskIdsForPinnedApps(),
|
||||
mControllers.taskbarViewController.getShownTaskIds(),
|
||||
this::onKeyboardQuickSwitchViewClosed);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user