Merge "Delete TaskbarStateHander" into sc-v2-dev am: c6bdd9243a (6b9f78e3) · Commits · e / os / android_packages_apps_Trebuchet

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ import com.android.launcher3.statehandlers.DepthController;
		import com.android.launcher3.statemanager.StateManager.StateHandler;
		import com.android.launcher3.taskbar.LauncherTaskbarUIController;
		import com.android.launcher3.taskbar.TaskbarManager;
		import com.android.launcher3.taskbar.TaskbarStateHandler;
		import com.android.launcher3.uioverrides.RecentsViewStateController;
		import com.android.launcher3.util.ActivityOptionsWrapper;
		import com.android.launcher3.util.DisplayController;
		@@ -115,8 +114,6 @@ public abstract class BaseQuickstepLauncher extends Launcher
		private @Nullable OverviewCommandHelper mOverviewCommandHelper;
		private @Nullable LauncherTaskbarUIController mTaskbarUIController;

		private final TaskbarStateHandler mTaskbarStateHandler = new TaskbarStateHandler(this);

		// Will be updated when dragging from taskbar.
		private @Nullable DragOptions mNextWorkspaceDragOptions = null;

		@@ -368,17 +365,12 @@ public abstract class BaseQuickstepLauncher extends Launcher
		out.add(getDepthController());
		out.add(new RecentsViewStateController(this));
		out.add(new BackButtonAlphaHandler(this));
		out.add(getTaskbarStateHandler());
		}

		public DepthController getDepthController() {
		return mDepthController;
		}

		public TaskbarStateHandler getTaskbarStateHandler() {
		return mTaskbarStateHandler;
		}

		@Nullable
		public UnfoldTransitionProgressProvider getUnfoldTransitionProgressProvider() {
		return mUnfoldTransitionProgressProvider;

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

deleted100644 → 0

+0 −71

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.launcher3.taskbar;

		import static com.android.launcher3.LauncherState.TASKBAR;
		import static com.android.launcher3.anim.Interpolators.LINEAR;

		import com.android.launcher3.BaseQuickstepLauncher;
		import com.android.launcher3.LauncherState;
		import com.android.launcher3.anim.PendingAnimation;
		import com.android.launcher3.anim.PropertySetter;
		import com.android.launcher3.statemanager.StateManager;
		import com.android.launcher3.states.StateAnimationConfig;
		import com.android.quickstep.AnimatedFloat;
		import com.android.quickstep.SystemUiProxy;

		/**
		* StateHandler to animate Taskbar according to Launcher's state machine.
		*/
		public class TaskbarStateHandler implements StateManager.StateHandler<LauncherState> {

		private final BaseQuickstepLauncher mLauncher;

		private AnimatedFloat mNavbarButtonAlpha = new AnimatedFloat(this::updateNavbarButtonAlpha);

		public TaskbarStateHandler(BaseQuickstepLauncher launcher) {
		mLauncher = launcher;
		}

		@Override
		public void setState(LauncherState state) {
		setState(state, PropertySetter.NO_ANIM_PROPERTY_SETTER);
		// Force update the alpha in case it was not initialized properly
		updateNavbarButtonAlpha();
		}

		@Override
		public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config,
		PendingAnimation animation) {
		setState(toState, animation);
		}

		/**
		* Sets the provided state
		*/
		public void setState(LauncherState toState, PropertySetter setter) {
		boolean isTaskbarVisible = (toState.getVisibleElements(mLauncher) & TASKBAR) != 0;
		// Make the nav bar visible in states that taskbar isn't visible.
		// TODO: We should draw our own handle instead of showing the nav bar.
		float navbarButtonAlpha = isTaskbarVisible ? 0f : 1f;
		setter.setFloat(mNavbarButtonAlpha, AnimatedFloat.VALUE, navbarButtonAlpha, LINEAR);
		}


		private void updateNavbarButtonAlpha() {
		SystemUiProxy.INSTANCE.get(mLauncher).setNavBarButtonAlpha(mNavbarButtonAlpha.value, false);
		}
		}