Merge "Remove Dep.get(CommandQueue.class) from NavBarView" into tm-dev (8e375e4c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+12 −9

Original line number	Diff line number	Diff line
		@@ -197,6 +197,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
		private final Optional<Pip> mPipOptional;
		private final Optional<Recents> mRecentsOptional;
		private final DeviceConfigProxy mDeviceConfigProxy;
		private final NavigationBarTransitions mNavigationBarTransitions;
		private final Optional<BackAnimation> mBackAnimation;
		private final Handler mHandler;
		private final NavigationBarOverlayController mNavbarOverlayController;
		@@ -513,6 +514,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
		InputMethodManager inputMethodManager,
		DeadZone deadZone,
		DeviceConfigProxy deviceConfigProxy,
		NavigationBarTransitions navigationBarTransitions,
		Optional<BackAnimation> backAnimation) {
		super(navigationBarView);
		mFrame = navigationBarFrame;
		@@ -537,6 +539,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
		mRecentsOptional = recentsOptional;
		mDeadZone = deadZone;
		mDeviceConfigProxy = deviceConfigProxy;
		mNavigationBarTransitions = navigationBarTransitions;
		mBackAnimation = backAnimation;
		mHandler = mainHandler;
		mNavbarOverlayController = navbarOverlayController;
		@@ -561,6 +564,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
		public void onInit() {
		// TODO: A great deal of this code should probably live in onViewAttached.
		// It should also has corresponding cleanup in onViewDetached.
		mView.setBarTransitions(mNavigationBarTransitions);
		mView.setTouchHandler(mTouchHandler);
		mView.setNavBarMode(mNavBarMode);
		mView.updateRotationButton();
		@@ -632,7 +636,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
		mView.setOnVerticalChangedListener(this::onVerticalChanged);
		mView.setOnTouchListener(this::onNavigationTouch);
		if (mSavedState != null) {
		mView.getLightTransitionsController().restoreState(mSavedState);
		getBarTransitions().getLightTransitionsController().restoreState(mSavedState);
		}
		setNavigationIconHints(mNavigationIconHints);
		mView.setWindowVisible(isNavBarWindowVisible());
		@@ -705,8 +709,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
		mView.getRotationButtonController();
		rotationButtonController.setRotationCallback(null);
		mView.setUpdateActiveTouchRegionsCallback(null);
		mView.getBarTransitions().destroy();
		mView.getLightTransitionsController().destroy(mContext);
		getBarTransitions().destroy();
		mOverviewProxyService.removeCallback(mOverviewProxyListener);
		mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver);
		if (mOrientationHandle != null) {
		@@ -732,7 +735,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
		outState.putInt(EXTRA_APPEARANCE, mAppearance);
		outState.putInt(EXTRA_BEHAVIOR, mBehavior);
		outState.putBoolean(EXTRA_TRANSIENT_STATE, mTransientShown);
		mView.getLightTransitionsController().saveState(outState);
		getBarTransitions().getLightTransitionsController().saveState(outState);
		}

		/**
		@@ -893,7 +896,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
		pw.println(" mTransientShown=" + mTransientShown);
		pw.println(" mTransientShownFromGestureOnSystemBar="
		+ mTransientShownFromGestureOnSystemBar);
		dumpBarTransitions(pw, "mNavigationBarView", mView.getBarTransitions());
		dumpBarTransitions(pw, "mNavigationBarView", getBarTransitions());
		mView.dump(pw);
		}

		@@ -1430,7 +1433,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
		mLightBarController = lightBarController;
		if (mLightBarController != null) {
		mLightBarController.setNavigationBar(
		mView.getLightTransitionsController());
		getBarTransitions().getLightTransitionsController());
		}
		}

		@@ -1472,7 +1475,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
		mCentralSurfacesOptionalLazy.get().map(CentralSurfaces::isDeviceInteractive)
		.orElse(false)
		&& mNavigationBarWindowState != WINDOW_STATE_HIDDEN;
		mView.getBarTransitions().transitionTo(mTransitionMode, anim);
		getBarTransitions().transitionTo(mTransitionMode, anim);
		}

		public void disableAnimationsDuringHide(long delay) {
		@@ -1492,11 +1495,11 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
		}

		public NavigationBarTransitions getBarTransitions() {
		return mView.getBarTransitions();
		return mNavigationBarTransitions;
		}

		public void finishBarAnimations() {
		mView.getBarTransitions().finishAnimations();
		getBarTransitions().finishAnimations();
		}

		private WindowManager.LayoutParams getBarLayoutParams(int rotation) {

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarTransitions.java

+11 −10

Original line number	Diff line number	Diff line
		@@ -31,17 +31,19 @@ import android.view.View;

		import com.android.systemui.Dependency;
		import com.android.systemui.R;
		import com.android.systemui.navigationbar.NavigationBarComponent.NavigationBarScope;
		import com.android.systemui.navigationbar.buttons.ButtonDispatcher;
		import com.android.systemui.plugins.statusbar.StatusBarStateController;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.phone.BarTransitions;
		import com.android.systemui.statusbar.phone.LightBarTransitionsController;
		import com.android.systemui.statusbar.policy.KeyguardStateController;

		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.List;

		import javax.inject.Inject;

		/** */
		@NavigationBarScope
		public final class NavigationBarTransitions extends BarTransitions implements
		LightBarTransitionsController.DarkIntensityApplier {

		@@ -81,15 +83,13 @@ public final class NavigationBarTransitions extends BarTransitions implements
		}
		};

		public NavigationBarTransitions(NavigationBarView view, CommandQueue commandQueue) {
		@Inject
		public NavigationBarTransitions(
		NavigationBarView view,
		LightBarTransitionsController.Factory lightBarTransitionsControllerFactory) {
		super(view, R.drawable.nav_background);
		mView = view;
		mLightTransitionsController = new LightBarTransitionsController(
		view.getContext(),
		this,
		commandQueue,
		Dependency.get(KeyguardStateController.class),
		Dependency.get(StatusBarStateController.class));
		mLightTransitionsController = lightBarTransitionsControllerFactory.create(this);
		mAllowAutoDimWallpaperNotVisible = view.getContext().getResources()
		.getBoolean(R.bool.config_navigation_bar_enable_auto_dim_no_visible_wallpaper);
		mDarkIntensityListeners = new ArrayList();
		@@ -127,6 +127,7 @@ public final class NavigationBarTransitions extends BarTransitions implements
		Display.DEFAULT_DISPLAY);
		} catch (RemoteException e) {
		}
		mLightTransitionsController.destroy();
		}

		@Override

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -85,7 +85,6 @@ import com.android.systemui.shared.rotation.RotationButtonController;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.shared.system.QuickStepContract;
		import com.android.systemui.shared.system.WindowManagerWrapper;
		import com.android.systemui.statusbar.CommandQueue;
		import com.android.systemui.statusbar.phone.AutoHideController;
		import com.android.systemui.statusbar.phone.CentralSurfaces;
		import com.android.systemui.statusbar.phone.LightBarTransitionsController;
		@@ -140,7 +139,7 @@ public class NavigationBarView extends FrameLayout {
		private EdgeBackGestureHandler mEdgeBackGestureHandler;
		private final DeadZone mDeadZone;
		private boolean mDeadZoneConsuming = false;
		private final NavigationBarTransitions mBarTransitions;
		private NavigationBarTransitions mBarTransitions;
		@Nullable
		private AutoHideController mAutoHideController;

		@@ -370,7 +369,6 @@ public class NavigationBarView extends FrameLayout {
		mConfiguration.updateFrom(context.getResources().getConfiguration());

		mScreenPinningNotify = new ScreenPinningNotify(mContext);
		mBarTransitions = new NavigationBarTransitions(this, Dependency.get(CommandQueue.class));

		mButtonDispatchers.put(R.id.back, new ButtonDispatcher(R.id.back));
		mButtonDispatchers.put(R.id.home, new ButtonDispatcher(R.id.home));
		@@ -418,12 +416,12 @@ public class NavigationBarView extends FrameLayout {
		}
		}

		public void setAutoHideController(AutoHideController autoHideController) {
		mAutoHideController = autoHideController;
		void setBarTransitions(NavigationBarTransitions navigationBarTransitions) {
		mBarTransitions = navigationBarTransitions;
		}

		public NavigationBarTransitions getBarTransitions() {
		return mBarTransitions;
		public void setAutoHideController(AutoHideController autoHideController) {
		mAutoHideController = autoHideController;
		}

		public LightBarTransitionsController getLightTransitionsController() {

packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -264,7 +264,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks,
		mWindowContext = null;
		}
		mAutoHideController.setNavigationBar(null);
		mLightBarTransitionsController.destroy(mContext);
		mLightBarTransitionsController.destroy();
		mLightBarController.setNavigationBar(null);
		mPipOptional.ifPresent(this::removePipExclusionBoundsChangeListener);
		mInitialized = false;

packages/SystemUI/src/com/android/systemui/statusbar/phone/LightBarTransitionsController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -93,7 +93,8 @@ public class LightBarTransitionsController implements Dumpable, Callbacks,
		mDisplayId = mContext.getDisplayId();
		}

		public void destroy(Context context) {
		/** Call to cleanup the LightBarTransitionsController when done with it. */
		public void destroy() {
		mCommandQueue.removeCallback(this);
		mStatusBarStateController.removeCallback(this);
		}