Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c088051c authored by Tony Wickham's avatar Tony Wickham
Browse files

Add OverviewScrim to show below overview but above workspace 

- Refactor some basic scrim logic to Scrim class and have
  WorkspaceAndHotseatScrim and OverviewScrim extend it
- Draw OverviewScrim under recents unless predictions are disabled, in
  which case draw it under hotseat (since that is in recents)
- Remove sysui scrim (behind status bar and nav bar) when overview is
  peeking

Bug: 132455160
Change-Id: Ia5d6f54582a4c5a70e3b2d4a98281567edd68519
parent 3bbb2026

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java

+3 −0
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ 
 */

package com.android.launcher3.uioverrides.states;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCRIM_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;

import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;

import static com.android.launcher3.anim.Interpolators.INSTANT;

import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_7;
@@ -43,6 +45,7 @@ public class OverviewPeekState extends OverviewState { 
        if (this == OVERVIEW_PEEK && fromState == NORMAL) {

            builder.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT);

            builder.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_7);

            builder.setInterpolator(ANIM_OVERVIEW_SCRIM_FADE, FAST_OUT_SLOW_IN);

        }

    }

}

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

+4 −4
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import com.android.launcher3.R; 
import com.android.launcher3.Workspace;

import com.android.launcher3.allapps.DiscoveryBounce;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.uioverrides.UiFactory;

import com.android.launcher3.userevent.nano.LauncherLogProto.Action;

import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;

import com.android.quickstep.SysUINavigationMode;
@@ -128,14 +127,15 @@ public class OverviewState extends LauncherState { 
        if (launcher.getDeviceProfile().isVerticalBarLayout()) {

            return VERTICAL_SWIPE_INDICATOR | RECENTS_CLEAR_ALL_BUTTON;

        } else {

            boolean hasAllAppsHeaderExtra = launcher.getAppsView() != null

                    && launcher.getAppsView().getFloatingHeaderView().hasVisibleContent();

            return HOTSEAT_SEARCH_BOX | VERTICAL_SWIPE_INDICATOR | RECENTS_CLEAR_ALL_BUTTON |

                    (launcher.getAppsView().getFloatingHeaderView().hasVisibleContent()

                            ? ALL_APPS_HEADER_EXTRA : HOTSEAT_ICONS);

                    (hasAllAppsHeaderExtra ? ALL_APPS_HEADER_EXTRA : HOTSEAT_ICONS);

        }

    }



    @Override

    public float getWorkspaceScrimAlpha(Launcher launcher) {

    public float getOverviewScrimAlpha(Launcher launcher) {

        return 0.5f;

    }

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
                mPeekAnim.start();

                recentsView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY,

                        HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);



                mLauncher.getDragLayer().getScrim().animateToSysuiMultiplier(isPaused ? 0 : 1,

                        peekDuration, 0);

            });

        }

    }

quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java

+14 −9
Original line number Diff line number Diff line
@@ -15,6 +15,11 @@ 
 */

package com.android.quickstep.util;



import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;

import static com.android.launcher3.LauncherState.BACKGROUND_APP;

import static com.android.launcher3.LauncherState.NORMAL;

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



import android.animation.Animator;

import android.animation.Animator.AnimatorListener;

import android.animation.AnimatorListenerAdapter;
@@ -35,15 +40,11 @@ import com.android.launcher3.Workspace; 
import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.PropertySetter;

import com.android.launcher3.anim.SpringObjectAnimator;

import com.android.launcher3.graphics.OverviewScrim;



import java.util.ArrayList;

import java.util.List;



import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;

import static com.android.launcher3.LauncherState.BACKGROUND_APP;

import static com.android.launcher3.LauncherState.NORMAL;

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



/**

 * Creates an animation where all the workspace items are moved into their final location,

 * staggered row by row from the bottom up.
@@ -122,8 +123,8 @@ public class StaggeredWorkspaceAnim { 
            addStaggeredAnimationForView(qsb, grid.inv.numRows + 2, totalRows);

        }



        addWorkspaceScrimAnimationForState(launcher, BACKGROUND_APP, 0);

        addWorkspaceScrimAnimationForState(launcher, NORMAL, ALPHA_DURATION_MS);

        addScrimAnimationForState(launcher, BACKGROUND_APP, 0);

        addScrimAnimationForState(launcher, NORMAL, ALPHA_DURATION_MS);



        AnimatorListener resetClipListener = new AnimatorListenerAdapter() {

            int numAnimations = mAnimators.size();
@@ -191,13 +192,17 @@ public class StaggeredWorkspaceAnim { 
        mAnimators.add(alpha);

    }



    private void addWorkspaceScrimAnimationForState(Launcher launcher, LauncherState state,

            long duration) {

    private void addScrimAnimationForState(Launcher launcher, LauncherState state, long duration) {

        AnimatorSetBuilder scrimAnimBuilder = new AnimatorSetBuilder();

        AnimationConfig scrimAnimConfig = new AnimationConfig();

        scrimAnimConfig.duration = duration;

        PropertySetter scrimPropertySetter = scrimAnimConfig.getPropertySetter(scrimAnimBuilder);

        launcher.getWorkspace().getStateTransitionAnimation().setScrim(scrimPropertySetter, state);

        mAnimators.add(scrimAnimBuilder.build());

        Animator fadeOverviewScrim = ObjectAnimator.ofFloat(

                launcher.getDragLayer().getOverviewScrim(), OverviewScrim.SCRIM_PROGRESS,

                state.getOverviewScrimAlpha(launcher));

        fadeOverviewScrim.setDuration(duration);

        mAnimators.add(fadeOverviewScrim);

    }

}

quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java

+10 −2
Original line number Diff line number Diff line
@@ -19,16 +19,20 @@ package com.android.launcher3.uioverrides; 
import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCRIM_FADE;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;

import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_Y;

import static com.android.launcher3.anim.AnimatorSetBuilder.FLAG_DONT_ANIMATE_OVERVIEW;

import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE_IN_OUT;

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

import static com.android.launcher3.graphics.Scrim.SCRIM_PROGRESS;



import android.util.FloatProperty;

import android.view.View;

import android.view.animation.Interpolator;



import androidx.annotation.NonNull;



import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.LauncherState.ScaleAndTranslation;
@@ -36,8 +40,7 @@ import com.android.launcher3.LauncherStateManager.AnimationConfig; 
import com.android.launcher3.LauncherStateManager.StateHandler;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.PropertySetter;



import androidx.annotation.NonNull;

import com.android.launcher3.graphics.OverviewScrim;



/**

 * State handler for recents view. Manages UI changes and animations for recents view based off the
@@ -67,6 +70,8 @@ public abstract class BaseRecentsViewStateController<T extends View> 
        mRecentsView.setTranslationX(translationX);

        mRecentsView.setTranslationY(scaleAndTranslation.translationY);

        getContentAlphaProperty().set(mRecentsView, state.overviewUi ? 1f : 0);

        OverviewScrim scrim = mLauncher.getDragLayer().getOverviewScrim();

        SCRIM_PROGRESS.set(scrim, state.getOverviewScrimAlpha(mLauncher));

    }



    @Override
@@ -110,6 +115,9 @@ public abstract class BaseRecentsViewStateController<T extends View> 
                translateYInterpolator);

        setter.setFloat(mRecentsView, getContentAlphaProperty(), toState.overviewUi ? 1 : 0,

                builder.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT));

        OverviewScrim scrim = mLauncher.getDragLayer().getOverviewScrim();

        setter.setFloat(scrim, SCRIM_PROGRESS, toState.getOverviewScrimAlpha(mLauncher),

                builder.getInterpolator(ANIM_OVERVIEW_SCRIM_FADE, LINEAR));

    }



    /**