From d0b6bfaa6906f6f7e9bf7a0729dd919ef5d08ede Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Tue, 23 Mar 2021 09:10:18 -0700 Subject: [PATCH] Remove some unused hotseat/qsb scaling code Now that QSB is always part of Hotseat, we don't need getQsbScaleAndTranslation(), and now that HOTSEAT_ICONS are never in Overview, we can remove the getHotseatScaleAndTranslation() override Test: Everything works as before Bug: 175137718 Change-Id: I902815d8e270269c1a2a9af54fa8480e5aef929d --- .../states/BackgroundAppState.java | 14 --------- .../uioverrides/states/OverviewState.java | 29 ------------------- src/com/android/launcher3/LauncherState.java | 4 --- .../WorkspaceStateTransitionAnimation.java | 1 - .../launcher3/dragndrop/DragLayer.java | 5 ++-- .../launcher3/graphics/OverviewScrim.java | 14 ++++----- .../android/launcher3/states/HintState.java | 6 ---- 7 files changed, 7 insertions(+), 66 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java index fb58bf6422..aa770d289a 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java @@ -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; diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java index 5a28cfdc0e..d8a5f9bdfe 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java @@ -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) { diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index e9a34953d5..fbb3ffdb76 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java @@ -176,10 +176,6 @@ public abstract class LauncherState implements BaseState { return launcher.getNormalOverviewScaleAndOffset(); } - public ScaleAndTranslation getQsbScaleAndTranslation(Launcher launcher) { - return new ScaleAndTranslation(NO_SCALE, NO_OFFSET, NO_OFFSET); - } - public float getOverviewFullscreenProgress() { return 0; } diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index 412754e211..1c9af2746d 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -96,7 +96,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(); diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 7a6b4f9aae..419c3f1a69 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -110,6 +110,8 @@ public class DragLayer extends BaseDragLayer { mDragController = dragController; recreateControllers(); + mOverviewScrim.setup(); + mWorkspaceDragScrim = new WorkspaceDragScrim((this)); mWorkspaceDragScrim.setWorkspace(workspace); @@ -118,8 +120,6 @@ public class DragLayer extends BaseDragLayer { mRootView = (LauncherRootView) getParent(); mSysUiScrim = new SysUiScrim(mRootView); mRootView.setSysUiScrim(mSysUiScrim); - - } @Override @@ -555,7 +555,6 @@ public class DragLayer extends BaseDragLayer { public void setInsets(Rect insets) { super.setInsets(insets); mSysUiScrim.onInsetsChanged(insets, mAllowSysuiScrims); - mOverviewScrim.onInsetsChanged(insets); } public WorkspaceDragScrim getWorkspaceDragScrim() { diff --git a/src/com/android/launcher3/graphics/OverviewScrim.java b/src/com/android/launcher3/graphics/OverviewScrim.java index c0c3e5e9c2..53303dbbe5 100644 --- a/src/com/android/launcher3/graphics/OverviewScrim.java +++ b/src/com/android/launcher3/graphics/OverviewScrim.java @@ -18,10 +18,6 @@ package com.android.launcher3.graphics; import static android.view.View.VISIBLE; -import static com.android.launcher3.LauncherState.HOTSEAT_ICONS; -import static com.android.launcher3.LauncherState.OVERVIEW; - -import android.graphics.Rect; import android.util.FloatProperty; import android.view.View; import android.view.ViewGroup; @@ -55,15 +51,15 @@ public class OverviewScrim extends Scrim { public OverviewScrim(View view) { super(view); - mStableScrimmedView = mCurrentScrimmedView = mLauncher.getOverviewPanel(); onExtractedColorsChanged(mWallpaperColorInfo); } - public void onInsetsChanged(Rect insets) { - mStableScrimmedView = (OVERVIEW.getVisibleElements(mLauncher) & HOTSEAT_ICONS) != 0 - ? mLauncher.getHotseat() - : mLauncher.getOverviewPanel(); + /** + * Initializes once view hierarchy is established. + */ + public void setup() { + mStableScrimmedView = mCurrentScrimmedView = mLauncher.getOverviewPanel(); } public void updateCurrentScrimmedView(ViewGroup root) { diff --git a/src/com/android/launcher3/states/HintState.java b/src/com/android/launcher3/states/HintState.java index fd1d965982..eb2c551994 100644 --- a/src/com/android/launcher3/states/HintState.java +++ b/src/com/android/launcher3/states/HintState.java @@ -53,10 +53,4 @@ public class HintState extends LauncherState { public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) { return new ScaleAndTranslation(0.92f, 0, 0); } - - @Override - public ScaleAndTranslation getQsbScaleAndTranslation(Launcher launcher) { - // Treat the QSB as part of the hotseat so they move together. - return getHotseatScaleAndTranslation(launcher); - } }