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

Commit 35a4e0ee authored by Tony Wickham's avatar Tony Wickham
Browse files

Tie prediction text to all apps interpolator 

Now floating headers get 2 interpolators: one for the header content
itselt, and one for the all apps content that follows. That way, they
can choose to intperolate part of their content as if it were part of
all apps instead of the header. Currently, we do this to animate
predicted icons quickly, followed by the all apps icons, predictions
text, all apps scrollbar, and all apps divider as you continue swiping.

Bug: 132455160
Change-Id: Ib3e373c291e174e1306a53854d0ad4dc29eb4b76
parent c088051c

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/AppsDividerView.java

+6 −6
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ import android.util.AttributeSet; 
import android.view.View;

import android.view.animation.Interpolator;



import androidx.annotation.ColorInt;

import androidx.core.content.ContextCompat;



import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;
@@ -41,9 +44,6 @@ import com.android.launcher3.allapps.FloatingHeaderView; 
import com.android.launcher3.anim.PropertySetter;

import com.android.launcher3.util.Themes;



import androidx.annotation.ColorInt;

import androidx.core.content.ContextCompat;



/**

 * A view which shows a horizontal divider

 */
@@ -288,10 +288,10 @@ public class AppsDividerView extends View implements LauncherStateManager.StateL 
    }



    @Override

    public void setContentVisibility(boolean hasHeaderExtra, boolean hasContent,

            PropertySetter setter, Interpolator fadeInterpolator) {

    public void setContentVisibility(boolean hasHeaderExtra, boolean hasAllAppsContent,

            PropertySetter setter, Interpolator headerFade, Interpolator allAppsFade) {

        // Don't use setViewAlpha as we want to control the visibility ourselves.

        setter.setFloat(this, ALPHA, hasContent ? 1 : 0, fadeInterpolator);

        setter.setFloat(this, ALPHA, hasAllAppsContent ? 1 : 0, allAppsFade);

    }



    @Override

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java

+27 −20
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ import android.view.View; 
import android.view.animation.Interpolator;

import android.widget.LinearLayout;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.launcher3.AppInfo;

import com.android.launcher3.BubbleTextView;

import com.android.launcher3.DeviceProfile;
@@ -62,9 +65,6 @@ import java.util.ArrayList; 
import java.util.Collections;

import java.util.List;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



@TargetApi(Build.VERSION_CODES.P)

public class PredictionRowView extends LinearLayout implements

        LogContainerProvider, OnDeviceProfileChangeListener, FloatingHeaderRow {
@@ -103,6 +103,8 @@ public class PredictionRowView extends LinearLayout implements 


    private final int mIconTextColor;

    private final int mIconFullTextAlpha;

    private int mIconLastSetTextAlpha;

    // Might use mIconFullTextAlpha instead of mIconLastSetTextAlpha if we are translucent.

    private int mIconCurrentTextAlpha;



    private FloatingHeaderView mParent;
@@ -315,14 +317,27 @@ public class PredictionRowView extends LinearLayout implements 
        }

    }



    public void setTextAlpha(int alpha) {

        mIconCurrentTextAlpha = alpha;

    public void setTextAlpha(int textAlpha) {

        mIconLastSetTextAlpha = textAlpha;

        if (getAlpha() < 1 && textAlpha > 0) {

            // If the entire header is translucent, make sure the text is at full opacity so it's

            // not double-translucent. However, we support keeping the text invisible (alpha == 0).

            textAlpha = mIconFullTextAlpha;

        }

        mIconCurrentTextAlpha = textAlpha;

        int iconColor = setColorAlphaBound(mIconTextColor, mIconCurrentTextAlpha);

        for (int i = 0; i < getChildCount(); i++) {

            ((BubbleTextView) getChildAt(i)).setTextColor(iconColor);

        }

    }



    @Override

    public void setAlpha(float alpha) {

        super.setAlpha(alpha);

        // Reapply text alpha so that we update it to be full alpha if the row is now translucent.

        setTextAlpha(mIconLastSetTextAlpha);

    }



    @Override

    public boolean hasOverlappingRendering() {

        return false;
@@ -351,23 +366,15 @@ public class PredictionRowView extends LinearLayout implements 
    }



    @Override

    public void setContentVisibility(boolean hasHeaderExtra, boolean hasContent,

            PropertySetter setter, Interpolator fadeInterpolator) {

        boolean isDrawn = getAlpha() > 0;

        int textAlpha = hasHeaderExtra

                ? (hasContent ? mIconFullTextAlpha : 0) // Text follows the content visibility

                : mIconCurrentTextAlpha; // Leave as before

        if (!isDrawn) {

            // If the header is not drawn, no need to animate the text alpha

            setTextAlpha(textAlpha);

        } else {

            setter.setInt(this, TEXT_ALPHA, textAlpha, fadeInterpolator);

        }



    public void setContentVisibility(boolean hasHeaderExtra, boolean hasAllAppsContent,

            PropertySetter setter, Interpolator headerFade, Interpolator allAppsFade) {

        // Text follows all apps visibility

        int textAlpha = hasHeaderExtra && hasAllAppsContent ? mIconFullTextAlpha : 0;

        setter.setInt(this, TEXT_ALPHA, textAlpha, allAppsFade);

        setter.setFloat(mOverviewScrollFactor, AnimatedFloat.VALUE,

                (hasHeaderExtra && !hasContent) ? 1 : 0, LINEAR);

                (hasHeaderExtra && !hasAllAppsContent) ? 1 : 0, LINEAR);

        setter.setFloat(mContentAlphaFactor, AnimatedFloat.VALUE, hasHeaderExtra ? 1 : 0,

                fadeInterpolator);

                headerFade);

    }



    @Override

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

+12 −0
Original line number Diff line number Diff line
@@ -23,13 +23,17 @@ import static com.android.launcher3.LauncherState.OVERVIEW; 
import static com.android.launcher3.LauncherState.OVERVIEW_PEEK;

import static com.android.launcher3.LauncherStateManager.ANIM_ALL;

import static com.android.launcher3.LauncherStateManager.ATOMIC_OVERVIEW_PEEK_COMPONENT;

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

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

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

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

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

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

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

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

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

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

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

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

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;
@@ -43,6 +47,7 @@ import android.view.ViewConfiguration; 
import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.anim.Interpolators;

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

import com.android.quickstep.OverviewInteractionState;

import com.android.quickstep.util.MotionPauseDetector;
@@ -123,6 +128,13 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
            LauncherState toState) {

        if (fromState == NORMAL && toState == ALL_APPS) {

            AnimatorSetBuilder builder = new AnimatorSetBuilder();

            // Fade in prediction icons quickly, then rest of all apps after reaching overview.

            float progressToReachOverview = NORMAL.getVerticalProgress(mLauncher)

                    - OVERVIEW.getVerticalProgress(mLauncher);

            builder.setInterpolator(ANIM_ALL_APPS_HEADER_FADE, Interpolators.clampToProgress(ACCEL,

                    0, ALL_APPS_CONTENT_FADE_THRESHOLD));

            builder.setInterpolator(ANIM_ALL_APPS_FADE, Interpolators.clampToProgress(LINEAR,

                    progressToReachOverview, 1));



            // Get workspace out of the way quickly, to prepare for potential pause.

            builder.setInterpolator(ANIM_WORKSPACE_SCALE, DEACCEL_3);

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr 
    /**

     * The progress at which all apps content will be fully visible when swiping up from overview.

     */

    private static final float ALL_APPS_CONTENT_FADE_THRESHOLD = 0.08f;

    protected static final float ALL_APPS_CONTENT_FADE_THRESHOLD = 0.08f;



    /**

     * The progress at which recents will begin fading out when swiping up from overview.

src/com/android/launcher3/allapps/AllAppsTransitionController.java

+7 −5
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import static com.android.launcher3.LauncherState.HOTSEAT_ICONS; 
import static com.android.launcher3.LauncherState.OVERVIEW;

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

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

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

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

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

import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
@@ -208,13 +209,14 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil 
        PropertySetter setter = config == null ? NO_ANIM_PROPERTY_SETTER

                : config.getPropertySetter(builder);

        boolean hasHeaderExtra = (visibleElements & ALL_APPS_HEADER_EXTRA) != 0;

        boolean hasContent = (visibleElements & ALL_APPS_CONTENT) != 0;

        boolean hasAllAppsContent = (visibleElements & ALL_APPS_CONTENT) != 0;



        Interpolator allAppsFade = builder.getInterpolator(ANIM_ALL_APPS_FADE, LINEAR);

        setter.setViewAlpha(mAppsView.getContentView(), hasContent ? 1 : 0, allAppsFade);

        setter.setViewAlpha(mAppsView.getScrollBar(), hasContent ? 1 : 0, allAppsFade);

        mAppsView.getFloatingHeaderView().setContentVisibility(hasHeaderExtra, hasContent, setter,

                allAppsFade);

        Interpolator headerFade = builder.getInterpolator(ANIM_ALL_APPS_HEADER_FADE, allAppsFade);

        setter.setViewAlpha(mAppsView.getContentView(), hasAllAppsContent ? 1 : 0, allAppsFade);

        setter.setViewAlpha(mAppsView.getScrollBar(), hasAllAppsContent ? 1 : 0, allAppsFade);

        mAppsView.getFloatingHeaderView().setContentVisibility(hasHeaderExtra, hasAllAppsContent,

                setter, headerFade, allAppsFade);

        mAppsView.getSearchUiManager().setContentVisibility(visibleElements, setter, allAppsFade);



        setter.setInt(mScrimView, ScrimView.DRAG_HANDLE_ALPHA,