Merge "Renaming TaskbarController to LauncherTaskbarUIController" into sc-dev (749f55f0) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -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());
		}
		}

quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -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

quickstep/src/com/android/launcher3/taskbar/TaskbarAnimationController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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));
		}
		}