mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-19 10:48:19 +00:00
Renaming TaskbarController to LauncherTaskbarUIController
Bug: 187353581 Test: N/A Change-Id: I44aac42c4df134fd7e6fc0c3609fdb3007cf52e3
This commit is contained in:
@@ -49,7 +49,7 @@ import com.android.launcher3.proxy.StartActivityParams;
|
||||
import com.android.launcher3.statehandlers.BackButtonAlphaHandler;
|
||||
import com.android.launcher3.statehandlers.DepthController;
|
||||
import com.android.launcher3.statemanager.StateManager.StateHandler;
|
||||
import com.android.launcher3.taskbar.TaskbarController;
|
||||
import com.android.launcher3.taskbar.LauncherTaskbarUIController;
|
||||
import com.android.launcher3.taskbar.TaskbarManager;
|
||||
import com.android.launcher3.taskbar.TaskbarStateHandler;
|
||||
import com.android.launcher3.uioverrides.RecentsViewStateController;
|
||||
@@ -96,7 +96,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
|
||||
private OverviewActionsView mActionsView;
|
||||
|
||||
private @Nullable TaskbarManager mTaskbarManager;
|
||||
private @Nullable TaskbarController mTaskbarController;
|
||||
private @Nullable LauncherTaskbarUIController mTaskbarUIController;
|
||||
private final ServiceConnection mTisBinderConnection = new ServiceConnection() {
|
||||
@Override
|
||||
public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
|
||||
@@ -261,8 +261,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
|
||||
|
||||
}
|
||||
|
||||
public void setTaskbarController(TaskbarController taskbarController) {
|
||||
mTaskbarController = taskbarController;
|
||||
public void setTaskbarUIController(LauncherTaskbarUIController taskbarUIController) {
|
||||
mTaskbarUIController = taskbarUIController;
|
||||
}
|
||||
|
||||
public <T extends OverviewActionsView> T getActionsView() {
|
||||
@@ -292,8 +292,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
|
||||
return mDepthController;
|
||||
}
|
||||
|
||||
public @Nullable TaskbarController getTaskbarController() {
|
||||
return mTaskbarController;
|
||||
public @Nullable LauncherTaskbarUIController getTaskbarUIController() {
|
||||
return mTaskbarUIController;
|
||||
}
|
||||
|
||||
public TaskbarStateHandler getTaskbarStateHandler() {
|
||||
@@ -349,8 +349,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
|
||||
|
||||
@Override
|
||||
public float getNormalTaskbarScale() {
|
||||
if (mTaskbarController != null) {
|
||||
return mTaskbarController.getTaskbarScaleOnHome();
|
||||
if (mTaskbarUIController != null) {
|
||||
return mTaskbarUIController.getTaskbarScaleOnHome();
|
||||
}
|
||||
return super.getNormalTaskbarScale();
|
||||
}
|
||||
@@ -372,8 +372,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
|
||||
}
|
||||
|
||||
if ((changeBits & ACTIVITY_STATE_RESUMED) != 0) {
|
||||
if (mTaskbarController != null) {
|
||||
mTaskbarController.onLauncherResumedOrPaused(hasBeenResumed());
|
||||
if (mTaskbarUIController != null) {
|
||||
mTaskbarUIController.onLauncherResumedOrPaused(hasBeenResumed());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user