aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-18 18:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Renaming TaskbarController to LauncherTaskbarUIC..."

Browse Source 
Revert submission 14664190

Reason for revert: Errorprone fixed in ag/14667108
Reverted Changes:
Icd1ddd43e:Revert "Renaming TaskbarController to LauncherTask...
I465013697:Revert "Moving taskbar lifecycle to TouchInteracti...

Change-Id: I1dcccb43d8206830e2b7c1974e775c94ac8c542f
Bug: 187353581
This commit is contained in:
Sunny Goyal
2021-05-20 20:18:47 +00:00
parent d5500548dc
commit f8b1c3b38e
7 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java
View File

@@ -50,7 +50,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;
@@ -97,7 +97,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) {
@@ -262,8 +262,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() {
@@ -293,8 +293,8 @@ public abstract class BaseQuickstepLauncher extends Launcher
return mDepthController;
}
public @Nullable TaskbarController getTaskbarController() {
return mTaskbarController;
public @Nullable LauncherTaskbarUIController getTaskbarUIController() {
return mTaskbarUIController;
}
public TaskbarStateHandler getTaskbarStateHandler() {
@@ -350,8 +350,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();
}
@@ -373,8 +373,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());
}
}

4
quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
View File

@@ -263,8 +263,8 @@ public class HotseatPredictionController implements DragController.DragListener,
removeOutlineDrawings();
}
if (mLauncher.getTaskbarController() != null) {
mLauncher.getTaskbarController().onHotseatUpdated();
if (mLauncher.getTaskbarUIController() != null) {
mLauncher.getTaskbarUIController().onHotseatUpdated();
}
}

9
quickstep/src/com/android/launcher3/taskbar/TaskbarController.java → quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
View File

@@ -38,7 +38,7 @@ import com.android.launcher3.states.StateAnimationConfig;
* TODO: Rename to have Launcher prefix
*/
public class TaskbarController extends TaskbarUIController {
public class LauncherTaskbarUIController extends TaskbarUIController {
private final BaseQuickstepLauncher mLauncher;
private final TaskbarStateHandler mTaskbarStateHandler;
@@ -52,7 +52,8 @@ public class TaskbarController extends TaskbarUIController {
private @Nullable Animator mAnimator;
private boolean mIsAnimatingToLauncher;
public TaskbarController(BaseQuickstepLauncher launcher, TaskbarActivityContext context) {
public LauncherTaskbarUIController(
BaseQuickstepLauncher launcher, TaskbarActivityContext context) {
mContext = context;
mTaskbarContainerView = context.getDragLayer();
mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view);
@@ -72,7 +73,7 @@ public class TaskbarController extends TaskbarUIController {
mHotseatController.init();
setTaskbarViewVisible(!mLauncher.hasBeenResumed());
alignRealHotseatWithTaskbar();
mLauncher.setTaskbarController(this);
mLauncher.setTaskbarUIController(this);
}
@Override
@@ -86,7 +87,7 @@ public class TaskbarController extends TaskbarUIController {
mHotseatController.cleanup();
setTaskbarViewVisible(true);
mLauncher.getHotseat().setIconsAlpha(1f);
mLauncher.setTaskbarController(null);
mLauncher.setTaskbarUIController(null);
}
@Override

2
quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java
View File

@@ -21,7 +21,7 @@ import android.animation.Animator;
import com.android.launcher3.BaseQuickstepLauncher;
import com.android.launcher3.Utilities;
import com.android.launcher3.taskbar.TaskbarController.TaskbarAnimationControllerCallbacks;
import com.android.launcher3.taskbar.LauncherTaskbarUIController.TaskbarAnimationControllerCallbacks;
import com.android.quickstep.AnimatedFloat;
import com.android.quickstep.SystemUiProxy;
import com.android.systemui.shared.system.QuickStepContract;

4
quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
View File

@@ -97,7 +97,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
if (mTaskbarActivityContext != null) {
mTaskbarActivityContext.setUIController(mLauncher == null
? TaskbarUIController.DEFAULT
: new TaskbarController(launcher, mTaskbarActivityContext));
: new LauncherTaskbarUIController(launcher, mTaskbarActivityContext));
}
}
@@ -115,7 +115,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen
mTaskbarActivityContext.init();
if (mLauncher != null) {
mTaskbarActivityContext.setUIController(
new TaskbarController(mLauncher, mTaskbarActivityContext));
new LauncherTaskbarUIController(mLauncher, mTaskbarActivityContext));
}
}

6
quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
View File

@@ -165,7 +165,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
@Override
public boolean startActivitySafely(View v, Intent intent, ItemInfo item) {
// Only pause is taskbar controller is not present
mHotseatPredictionController.setPauseUIUpdate(getTaskbarController() == null);
mHotseatPredictionController.setPauseUIUpdate(getTaskbarUIController() == null);
return super.startActivitySafely(v, intent, item);
}
@@ -233,9 +233,9 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
@Override
public void bindWorkspaceItemsChanged(List<WorkspaceItemInfo> updated) {
super.bindWorkspaceItemsChanged(updated);
if (getTaskbarController() != null && updated.stream()
if (getTaskbarUIController() != null && updated.stream()
.filter(w -> w.container == CONTAINER_HOTSEAT).findFirst().isPresent()) {
getTaskbarController().onHotseatUpdated();
getTaskbarUIController().onHotseatUpdated();
}
}

24
quickstep/src/com/android/quickstep/LauncherActivityInterface.java
View File

@@ -41,7 +41,7 @@ import com.android.launcher3.anim.PendingAnimation;
import com.android.launcher3.statehandlers.DepthController;
import com.android.launcher3.statehandlers.DepthController.ClampedDepthProperty;
import com.android.launcher3.statemanager.StateManager;
import com.android.launcher3.taskbar.TaskbarController;
import com.android.launcher3.taskbar.LauncherTaskbarUIController;
import com.android.launcher3.touch.PagedOrientationHandler;
import com.android.quickstep.GestureState.GestureEndTarget;
import com.android.quickstep.SysUINavigationMode.Mode;
@@ -163,12 +163,12 @@ public final class LauncherActivityInterface extends
}
@Nullable
private TaskbarController getTaskbarController() {
private LauncherTaskbarUIController getTaskbarController() {
BaseQuickstepLauncher launcher = getCreatedActivity();
if (launcher == null) {
return null;
}
return launcher.getTaskbarController();
return launcher.getTaskbarUIController();
}
@Nullable
@@ -276,13 +276,13 @@ public final class LauncherActivityInterface extends
@Override
public @Nullable Animator getParallelAnimationToLauncher(GestureEndTarget endTarget,
long duration) {
TaskbarController taskbarController = getTaskbarController();
LauncherTaskbarUIController uiController = getTaskbarController();
Animator superAnimator = super.getParallelAnimationToLauncher(endTarget, duration);
if (taskbarController == null) {
if (uiController == null) {
return superAnimator;
}
LauncherState toState = stateFromGestureEndTarget(endTarget);
Animator taskbarAnimator = taskbarController.createAnimToLauncher(toState, duration);
Animator taskbarAnimator = uiController.createAnimToLauncher(toState, duration);
if (superAnimator == null) {
return taskbarAnimator;
} else {
@@ -300,20 +300,20 @@ public final class LauncherActivityInterface extends
@Override
public boolean deferStartingActivity(RecentsAnimationDeviceState deviceState, MotionEvent ev) {
TaskbarController taskbarController = getTaskbarController();
if (taskbarController == null) {
LauncherTaskbarUIController uiController = getTaskbarController();
if (uiController == null) {
return super.deferStartingActivity(deviceState, ev);
}
return taskbarController.isEventOverAnyTaskbarItem(ev);
return uiController.isEventOverAnyTaskbarItem(ev);
}
@Override
public boolean shouldCancelCurrentGesture() {
TaskbarController taskbarController = getTaskbarController();
if (taskbarController == null) {
LauncherTaskbarUIController uiController = getTaskbarController();
if (uiController == null) {
return super.shouldCancelCurrentGesture();
}
return taskbarController.isDraggingItem();
return uiController.isDraggingItem();
}
@Override