diff --git a/quickstep/src/com/android/launcher3/uioverrides/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/OverviewState.java index 3458a3f9d7..267c4d06f4 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/OverviewState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/OverviewState.java @@ -56,6 +56,11 @@ public class OverviewState extends LauncherState { return new float[] {scale, pageRect.top - childTop}; } + @Override + public float getHoseatAlpha(Launcher launcher) { + return launcher.getDeviceProfile().isVerticalBarLayout() ? 0 : 1; + } + @Override public void onStateEnabled(Launcher launcher) { RecentsView rv = launcher.getOverviewPanel(); diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index dfb935fd43..01ab56317b 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java @@ -131,6 +131,10 @@ public class LauncherState { return new float[] {1, 0}; } + public float getHoseatAlpha(Launcher launcher) { + return 1f; + } + public void onStateEnabled(Launcher launcher) { dispatchWindowStateChanged(launcher); } diff --git a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java index 9f76b6f962..2392c9b412 100644 --- a/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java +++ b/src/com/android/launcher3/WorkspaceStateTransitionAnimation.java @@ -18,6 +18,7 @@ package com.android.launcher3; import static com.android.launcher3.LauncherAnimUtils.DRAWABLE_ALPHA; import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY; +import static com.android.launcher3.Partner.TAG; import static com.android.launcher3.compat.AccessibilityManagerCompat.isAccessibilityEnabled; import android.animation.Animator; @@ -25,6 +26,7 @@ import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; import android.animation.TimeInterpolator; import android.animation.ValueAnimator; +import android.util.Log; import android.util.Property; import android.view.View; @@ -138,6 +140,10 @@ public class WorkspaceStateTransitionAnimation { propertySetter.setFloat(mWorkspace, View.TRANSLATION_Y, finalWorkspaceTranslationY, Interpolators.ZOOM_IN); + float hotseatAlpha = state.getHoseatAlpha(mLauncher); + propertySetter.setViewAlpha(mWorkspace.createHotseatAlphaAnimator(hotseatAlpha), + mLauncher.getHotseat(), hotseatAlpha); + // Set scrim propertySetter.setInt(mLauncher.getDragLayer().getScrim(), DRAWABLE_ALPHA, state.hasScrim ? mWorkspaceScrimAlpha : 0, Interpolators.DEACCEL_1_5); @@ -159,6 +165,7 @@ public class WorkspaceStateTransitionAnimation { public static class PropertySetter { public void setViewAlpha(Animator anim, View view, float alpha) { + Log.d(TAG, "setViewAlpha: " + anim + " " + alpha); if (anim != null) { anim.end(); return; diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/OverviewPanel.java b/src_ui_overrides/com/android/launcher3/uioverrides/OverviewPanel.java index b23927be22..26dd68f718 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/OverviewPanel.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/OverviewPanel.java @@ -173,13 +173,8 @@ public class OverviewPanel extends LinearLayout implements Insettable, View.OnCl } private void setState(LauncherState state, PropertySetter setter) { - boolean isOverview = state == LauncherState.OVERVIEW; - float finalHotseatAlpha = isOverview ? 0 : 1; - - setter.setViewAlpha(null, this, isOverview ? 1 : 0); - setter.setViewAlpha( - mLauncher.getWorkspace().createHotseatAlphaAnimator(finalHotseatAlpha), - mLauncher.getHotseat(), finalHotseatAlpha); + float hotseatAlpha = state.getHoseatAlpha(mLauncher); + setter.setViewAlpha(null, this, 1f - hotseatAlpha); } public static int getButtonBarHeight(Launcher launcher) { diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/OverviewState.java b/src_ui_overrides/com/android/launcher3/uioverrides/OverviewState.java index bcbe61c9f0..73f208e8f7 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/OverviewState.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/OverviewState.java @@ -62,6 +62,11 @@ public class OverviewState extends LauncherState { return new float[] {SCALE_FACTOR, -workspaceOffsetTopEdge + overviewOffsetTopEdge }; } + @Override + public float getHoseatAlpha(Launcher launcher) { + return 0; + } + @Override public void onStateEnabled(Launcher launcher) { launcher.getWorkspace().setPageRearrangeEnabled(true);