From bb6f6e5dae072223f8505ee9791d3eec7bc72d64 Mon Sep 17 00:00:00 2001 From: Kholoud Mohamed Date: Thu, 20 May 2021 11:54:09 +0000 Subject: [PATCH] Revert "Renaming TaskbarController to LauncherTaskbarUIController" This reverts commit 40a742161938b343589e88e4b7f44b1cd67a69f1. Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/tests/view?invocationId=I13700009003387451&testResultId=TR89423459137251402, bug https://buganizer.corp.google.com/issues/188755902 Bug: 188755902 Change-Id: Icd1ddd43e62d392f6b68b0150a1075f73106391a --- .../launcher3/BaseQuickstepLauncher.java | 20 ++++++++-------- .../HotseatPredictionController.java | 4 ++-- .../taskbar/TaskbarAnimationController.java | 2 +- ...Controller.java => TaskbarController.java} | 9 ++++--- .../launcher3/taskbar/TaskbarManager.java | 4 ++-- .../uioverrides/QuickstepLauncher.java | 6 ++--- .../quickstep/LauncherActivityInterface.java | 24 +++++++++---------- 7 files changed, 34 insertions(+), 35 deletions(-) rename quickstep/src/com/android/launcher3/taskbar/{LauncherTaskbarUIController.java => TaskbarController.java} (97%) diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java index de62e93b4e..bc2c125854 100644 --- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java @@ -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.LauncherTaskbarUIController; +import com.android.launcher3.taskbar.TaskbarController; 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 LauncherTaskbarUIController mTaskbarUIController; + private @Nullable TaskbarController mTaskbarController; 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 setTaskbarUIController(LauncherTaskbarUIController taskbarUIController) { - mTaskbarUIController = taskbarUIController; + public void setTaskbarController(TaskbarController taskbarController) { + mTaskbarController = taskbarController; } public T getActionsView() { @@ -292,8 +292,8 @@ public abstract class BaseQuickstepLauncher extends Launcher return mDepthController; } - public @Nullable LauncherTaskbarUIController getTaskbarUIController() { - return mTaskbarUIController; + public @Nullable TaskbarController getTaskbarController() { + return mTaskbarController; } public TaskbarStateHandler getTaskbarStateHandler() { @@ -349,8 +349,8 @@ public abstract class BaseQuickstepLauncher extends Launcher @Override public float getNormalTaskbarScale() { - if (mTaskbarUIController != null) { - return mTaskbarUIController.getTaskbarScaleOnHome(); + if (mTaskbarController != null) { + return mTaskbarController.getTaskbarScaleOnHome(); } return super.getNormalTaskbarScale(); } @@ -372,8 +372,8 @@ public abstract class BaseQuickstepLauncher extends Launcher } if ((changeBits & ACTIVITY_STATE_RESUMED) != 0) { - if (mTaskbarUIController != null) { - mTaskbarUIController.onLauncherResumedOrPaused(hasBeenResumed()); + if (mTaskbarController != null) { + mTaskbarController.onLauncherResumedOrPaused(hasBeenResumed()); } } diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java index 85e5ab0a9b..5dcf84c249 100644 --- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java +++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java @@ -263,8 +263,8 @@ public class HotseatPredictionController implements DragController.DragListener, removeOutlineDrawings(); } - if (mLauncher.getTaskbarUIController() != null) { - mLauncher.getTaskbarUIController().onHotseatUpdated(); + if (mLauncher.getTaskbarController() != null) { + mLauncher.getTaskbarController().onHotseatUpdated(); } } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java index e20ddf88ce..815efb9728 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java @@ -21,7 +21,7 @@ import android.animation.Animator; import com.android.launcher3.BaseQuickstepLauncher; import com.android.launcher3.Utilities; -import com.android.launcher3.taskbar.LauncherTaskbarUIController.TaskbarAnimationControllerCallbacks; +import com.android.launcher3.taskbar.TaskbarController.TaskbarAnimationControllerCallbacks; import com.android.quickstep.AnimatedFloat; import com.android.quickstep.SystemUiProxy; import com.android.systemui.shared.system.QuickStepContract; diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java similarity index 97% rename from quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java rename to quickstep/src/com/android/launcher3/taskbar/TaskbarController.java index 67264194b2..cdae5beb9a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarController.java @@ -38,7 +38,7 @@ import com.android.launcher3.states.StateAnimationConfig; * TODO: Rename to have Launcher prefix */ -public class LauncherTaskbarUIController extends TaskbarUIController { +public class TaskbarController extends TaskbarUIController { private final BaseQuickstepLauncher mLauncher; private final TaskbarStateHandler mTaskbarStateHandler; @@ -52,8 +52,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { private @Nullable Animator mAnimator; private boolean mIsAnimatingToLauncher; - public LauncherTaskbarUIController( - BaseQuickstepLauncher launcher, TaskbarActivityContext context) { + public TaskbarController(BaseQuickstepLauncher launcher, TaskbarActivityContext context) { mContext = context; mTaskbarContainerView = context.getDragLayer(); mTaskbarView = mTaskbarContainerView.findViewById(R.id.taskbar_view); @@ -73,7 +72,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { mHotseatController.init(); setTaskbarViewVisible(!mLauncher.hasBeenResumed()); alignRealHotseatWithTaskbar(); - mLauncher.setTaskbarUIController(this); + mLauncher.setTaskbarController(this); } @Override @@ -87,7 +86,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController { mHotseatController.cleanup(); setTaskbarViewVisible(true); mLauncher.getHotseat().setIconsAlpha(1f); - mLauncher.setTaskbarUIController(null); + mLauncher.setTaskbarController(null); } @Override diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java index 65c87bd279..b9eec93687 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java @@ -97,7 +97,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen if (mTaskbarActivityContext != null) { mTaskbarActivityContext.setUIController(mLauncher == null ? TaskbarUIController.DEFAULT - : new LauncherTaskbarUIController(launcher, mTaskbarActivityContext)); + : new TaskbarController(launcher, mTaskbarActivityContext)); } } @@ -115,7 +115,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen mTaskbarActivityContext.init(); if (mLauncher != null) { mTaskbarActivityContext.setUIController( - new LauncherTaskbarUIController(mLauncher, mTaskbarActivityContext)); + new TaskbarController(mLauncher, mTaskbarActivityContext)); } } diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index f0b02b3c47..45bb521336 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -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(getTaskbarUIController() == null); + mHotseatPredictionController.setPauseUIUpdate(getTaskbarController() == null); return super.startActivitySafely(v, intent, item); } @@ -233,9 +233,9 @@ public class QuickstepLauncher extends BaseQuickstepLauncher { @Override public void bindWorkspaceItemsChanged(List updated) { super.bindWorkspaceItemsChanged(updated); - if (getTaskbarUIController() != null && updated.stream() + if (getTaskbarController() != null && updated.stream() .filter(w -> w.container == CONTAINER_HOTSEAT).findFirst().isPresent()) { - getTaskbarUIController().onHotseatUpdated(); + getTaskbarController().onHotseatUpdated(); } } diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java index 9014774ae7..ff69180d33 100644 --- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java +++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java @@ -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.LauncherTaskbarUIController; +import com.android.launcher3.taskbar.TaskbarController; 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 LauncherTaskbarUIController getTaskbarController() { + private TaskbarController getTaskbarController() { BaseQuickstepLauncher launcher = getCreatedActivity(); if (launcher == null) { return null; } - return launcher.getTaskbarUIController(); + return launcher.getTaskbarController(); } @Nullable @@ -276,13 +276,13 @@ public final class LauncherActivityInterface extends @Override public @Nullable Animator getParallelAnimationToLauncher(GestureEndTarget endTarget, long duration) { - LauncherTaskbarUIController uiController = getTaskbarController(); + TaskbarController taskbarController = getTaskbarController(); Animator superAnimator = super.getParallelAnimationToLauncher(endTarget, duration); - if (uiController == null) { + if (taskbarController == null) { return superAnimator; } LauncherState toState = stateFromGestureEndTarget(endTarget); - Animator taskbarAnimator = uiController.createAnimToLauncher(toState, duration); + Animator taskbarAnimator = taskbarController.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) { - LauncherTaskbarUIController uiController = getTaskbarController(); - if (uiController == null) { + TaskbarController taskbarController = getTaskbarController(); + if (taskbarController == null) { return super.deferStartingActivity(deviceState, ev); } - return uiController.isEventOverAnyTaskbarItem(ev); + return taskbarController.isEventOverAnyTaskbarItem(ev); } @Override public boolean shouldCancelCurrentGesture() { - LauncherTaskbarUIController uiController = getTaskbarController(); - if (uiController == null) { + TaskbarController taskbarController = getTaskbarController(); + if (taskbarController == null) { return super.shouldCancelCurrentGesture(); } - return uiController.isDraggingItem(); + return taskbarController.isDraggingItem(); } @Override