Merge "Remove some unused hotseat/qsb scaling code" into sc-dev (b9d201a5) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java

+0 −14

Original line number	Diff line number	Diff line
		@@ -81,20 +81,6 @@ public class BackgroundAppState extends OverviewState {
		return false;
		}

		@Override
		public ScaleAndTranslation getHotseatScaleAndTranslation(Launcher launcher) {
		if ((getVisibleElements(launcher) & HOTSEAT_ICONS) != 0) {
		// Translate hotseat offscreen if we show it in overview.
		RecentsView recentsView = launcher.getOverviewPanel();
		ScaleAndTranslation scaleAndTranslation = super.getHotseatScaleAndTranslation(launcher);
		scaleAndTranslation.translationY += LayoutUtils.getShelfTrackingDistance(launcher,
		launcher.getDeviceProfile(),
		recentsView.getPagedOrientationHandler());
		return scaleAndTranslation;
		}
		return super.getHotseatScaleAndTranslation(launcher);
		}

		@Override
		protected float getDepthUnchecked(Context context) {
		return 1f;

quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java

+0 −29

Original line number	Diff line number	Diff line
		@@ -77,40 +77,11 @@ public class OverviewState extends LauncherState {
		return new ScaleAndTranslation(scale, 0, -getDefaultSwipeHeight(launcher) * parallaxFactor);
		}

		@Override
		public ScaleAndTranslation getHotseatScaleAndTranslation(Launcher launcher) {
		if ((getVisibleElements(launcher) & HOTSEAT_ICONS) != 0) {
		DeviceProfile dp = launcher.getDeviceProfile();
		if (dp.allAppsIconSizePx >= dp.iconSizePx) {
		return new ScaleAndTranslation(1, 0, 0);
		} else {
		float scale = ((float) dp.allAppsIconSizePx) / dp.iconSizePx;
		// Distance between the screen center (which is the pivotY for hotseat) and the
		// bottom of the hotseat (which we want to preserve)
		float distanceFromBottom = dp.heightPx / 2 - dp.hotseatBarBottomPaddingPx;
		// On scaling, the bottom edge is moved closer to the pivotY. We move the
		// hotseat back down so that the bottom edge's position is preserved.
		float translationY = distanceFromBottom * (1 - scale);
		return new ScaleAndTranslation(scale, 0, translationY);
		}
		}
		return getWorkspaceScaleAndTranslation(launcher);
		}

		@Override
		public float[] getOverviewScaleAndOffset(Launcher launcher) {
		return new float[] {NO_SCALE, NO_OFFSET};
		}

		@Override
		public ScaleAndTranslation getQsbScaleAndTranslation(Launcher launcher) {
		if (this == OVERVIEW) {
		// Treat the QSB as part of the hotseat so they move together.
		return getHotseatScaleAndTranslation(launcher);
		}
		return super.getQsbScaleAndTranslation(launcher);
		}

		@Override
		public PageAlphaProvider getWorkspacePageAlphaProvider(Launcher launcher) {
		return new PageAlphaProvider(DEACCEL_2) {

src/com/android/launcher3/LauncherState.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -176,10 +176,6 @@ public abstract class LauncherState implements BaseState<LauncherState> {
		return launcher.getNormalOverviewScaleAndOffset();
		}

		public ScaleAndTranslation getQsbScaleAndTranslation(Launcher launcher) {
		return new ScaleAndTranslation(NO_SCALE, NO_OFFSET, NO_OFFSET);
		}

		public float getOverviewFullscreenProgress() {
		return 0;
		}

src/com/android/launcher3/WorkspaceStateTransitionAnimation.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,6 @@ public class WorkspaceStateTransitionAnimation {
		ScaleAndTranslation scaleAndTranslation = state.getWorkspaceScaleAndTranslation(mLauncher);
		ScaleAndTranslation hotseatScaleAndTranslation = state.getHotseatScaleAndTranslation(
		mLauncher);
		ScaleAndTranslation qsbScaleAndTranslation = state.getQsbScaleAndTranslation(mLauncher);
		mNewScale = scaleAndTranslation.scale;
		PageAlphaProvider pageAlphaProvider = state.getWorkspacePageAlphaProvider(mLauncher);
		final int childCount = mWorkspace.getChildCount();

src/com/android/launcher3/dragndrop/DragLayer.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -110,6 +110,8 @@ public class DragLayer extends BaseDragLayer<Launcher> {
		mDragController = dragController;
		recreateControllers();

		mOverviewScrim.setup();

		mWorkspaceDragScrim = new WorkspaceDragScrim((this));
		mWorkspaceDragScrim.setWorkspace(workspace);

		@@ -118,8 +120,6 @@ public class DragLayer extends BaseDragLayer<Launcher> {
		mRootView = (LauncherRootView) getParent();
		mSysUiScrim = new SysUiScrim(mRootView);
		mRootView.setSysUiScrim(mSysUiScrim);


		}

		@Override
		@@ -555,7 +555,6 @@ public class DragLayer extends BaseDragLayer<Launcher> {
		public void setInsets(Rect insets) {
		super.setInsets(insets);
		mSysUiScrim.onInsetsChanged(insets, mAllowSysuiScrims);
		mOverviewScrim.onInsetsChanged(insets);
		}

		public WorkspaceDragScrim getWorkspaceDragScrim() {