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

Commit 81dc9ad1 authored by Pat Manning's avatar Pat Manning
Browse files

Refactor overview progress as splash progress. 

This also avoids showing splash in split select state

Fix: 242284413
Test: follow up after b/238405972
Change-Id: I2e83fa3d030e8a74edb4152c472dbf02ac5a80b1
parent 831f5ee7

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

+14 −7
Original line number Diff line number Diff line
@@ -30,15 +30,16 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TR 
import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;

import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;

import static com.android.quickstep.views.RecentsView.FIRST_FLOATING_TASK_TRANSLATE_OFFSCREEN;

import static com.android.quickstep.views.RecentsView.OVERVIEW_PROGRESS;

import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;

import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;

import static com.android.quickstep.views.RecentsView.SPLIT_INSTRUCTIONS_FADE;

import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;

import static com.android.quickstep.views.RecentsView.TASK_THUMBNAIL_SPLASH_ALPHA;



import android.graphics.Rect;

import android.graphics.RectF;

import android.util.FloatProperty;

import android.view.animation.Interpolator;



import androidx.annotation.NonNull;
@@ -79,7 +80,7 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView> 
        getTaskModalnessProperty().set(mRecentsView, state.getOverviewModalness());

        RECENTS_GRID_PROGRESS.set(mRecentsView,

                state.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f);

        OVERVIEW_PROGRESS.set(mRecentsView, state == LauncherState.OVERVIEW ? 1f : 0f);

        TASK_THUMBNAIL_SPLASH_ALPHA.set(mRecentsView, state.showTaskThumbnailSplash() ? 1f : 0f);

    }



    @Override
@@ -158,13 +159,19 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView> 
                mRecentsView, getTaskModalnessProperty(),

                toState.getOverviewModalness(),

                config.getInterpolator(ANIM_OVERVIEW_MODAL, LINEAR));



        LauncherState fromState = mLauncher.getStateManager().getState();

        setter.setFloat(mRecentsView, TASK_THUMBNAIL_SPLASH_ALPHA,

                toState.showTaskThumbnailSplash() ? 1f : 0f,

                !toState.showTaskThumbnailSplash() && fromState == LauncherState.QUICK_SWITCH

                        ? LINEAR : INSTANT);



        boolean showAsGrid = toState.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile());

        Interpolator gridProgressInterpolator = showAsGrid

                ? fromState == LauncherState.QUICK_SWITCH ? LINEAR : INSTANT

                : FINAL_FRAME;

        setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS, showAsGrid ? 1f : 0f,

                showAsGrid ? INSTANT : FINAL_FRAME);



        boolean toOverview = toState == LauncherState.OVERVIEW;

        setter.setFloat(mRecentsView, OVERVIEW_PROGRESS, toOverview ? 1f : 0f,

                toOverview ? INSTANT : FINAL_FRAME);

                gridProgressInterpolator);

    }



    abstract FloatProperty getTaskModalnessProperty();

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

+5 −0
Original line number Diff line number Diff line
@@ -82,6 +82,11 @@ public class BackgroundAppState extends OverviewState { 
        return false;

    }



    @Override

    public boolean showTaskThumbnailSplash() {

        return true;

    }



    @Override

    protected float getDepthUnchecked(Context context) {

        return 1;

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

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA; 
import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;

import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;

import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;

import static com.android.quickstep.views.RecentsView.TASK_THUMBNAIL_SPLASH_ALPHA;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;



import android.animation.Animator;
@@ -225,6 +226,7 @@ public class NoButtonQuickSwitchTouchController implements TouchController, 
        // Set RecentView's initial properties.

        RECENTS_SCALE_PROPERTY.set(mRecentsView, fromState.getOverviewScaleAndOffset(mLauncher)[0]);

        ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mRecentsView, 1f);

        TASK_THUMBNAIL_SPLASH_ALPHA.set(mRecentsView, fromState.showTaskThumbnailSplash() ? 1f : 0);

        mRecentsView.setContentAlpha(1);

        mRecentsView.setFullscreenProgress(fromState.getOverviewFullscreenProgress());

        mLauncher.getActionsView().getVisibilityAlpha().setValue(

quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java

+3 −3
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW; 
import static com.android.quickstep.fallback.RecentsState.OVERVIEW_SPLIT_SELECT;

import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;

import static com.android.quickstep.views.RecentsView.FULLSCREEN_PROGRESS;

import static com.android.quickstep.views.RecentsView.OVERVIEW_PROGRESS;

import static com.android.quickstep.views.RecentsView.RECENTS_GRID_PROGRESS;

import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;

import static com.android.quickstep.views.RecentsView.TASK_MODALNESS;

import static com.android.quickstep.views.RecentsView.TASK_PRIMARY_SPLIT_TRANSLATION;

import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_SPLIT_TRANSLATION;

import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION;

import static com.android.quickstep.views.RecentsView.TASK_THUMBNAIL_SPLASH_ALPHA;

import static com.android.quickstep.views.TaskView.FLAG_UPDATE_ALL;



import android.util.FloatProperty;
@@ -106,8 +106,8 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState 
        boolean showAsGrid = state.displayOverviewTasksAsGrid(mActivity.getDeviceProfile());

        setter.setFloat(mRecentsView, RECENTS_GRID_PROGRESS, showAsGrid ? 1f : 0f,

                showAsGrid ? INSTANT : FINAL_FRAME);

        setter.setFloat(mRecentsView, OVERVIEW_PROGRESS, state == RecentsState.DEFAULT ? 1f : 0f,

                INSTANT);

        setter.setFloat(mRecentsView, TASK_THUMBNAIL_SPLASH_ALPHA,

                state.showTaskThumbnailSplash() ? 1f : 0f, INSTANT);



        setter.setViewBackgroundColor(mActivity.getScrimView(), state.getScrimColor(mActivity),

                config.getInterpolator(ANIM_SCRIM_FADE, LINEAR));

quickstep/src/com/android/quickstep/fallback/RecentsState.java

+8 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ public class RecentsState implements BaseState<RecentsState> { 
    private static final int FLAG_SCRIM = BaseState.getFlag(5);

    private static final int FLAG_LIVE_TILE = BaseState.getFlag(6);

    private static final int FLAG_OVERVIEW_UI = BaseState.getFlag(7);

    private static final int FLAG_TASK_THUMBNAIL_SPLASH = BaseState.getFlag(8);



    public static final RecentsState DEFAULT = new RecentsState(0,

            FLAG_DISABLE_RESTORE | FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_SHOW_AS_GRID
@@ -49,7 +50,8 @@ public class RecentsState implements BaseState<RecentsState> { 
            FLAG_DISABLE_RESTORE | FLAG_CLEAR_ALL_BUTTON | FLAG_OVERVIEW_ACTIONS | FLAG_MODAL

                    | FLAG_SHOW_AS_GRID | FLAG_SCRIM | FLAG_LIVE_TILE | FLAG_OVERVIEW_UI);

    public static final RecentsState BACKGROUND_APP = new BackgroundAppState(2,

            FLAG_DISABLE_RESTORE | FLAG_NON_INTERACTIVE | FLAG_FULL_SCREEN | FLAG_OVERVIEW_UI);

            FLAG_DISABLE_RESTORE | FLAG_NON_INTERACTIVE | FLAG_FULL_SCREEN | FLAG_OVERVIEW_UI

                    | FLAG_TASK_THUMBNAIL_SPLASH);

    public static final RecentsState HOME = new RecentsState(3, 0);

    public static final RecentsState BG_LAUNCHER = new LauncherState(4, 0);

    public static final RecentsState OVERVIEW_SPLIT_SELECT = new RecentsState(5,
@@ -139,6 +141,11 @@ public class RecentsState implements BaseState<RecentsState> { 
        return hasFlag(FLAG_SHOW_AS_GRID) && deviceProfile.isTablet;

    }



    @Override

    public boolean showTaskThumbnailSplash() {

        return hasFlag(FLAG_TASK_THUMBNAIL_SPLASH);

    }



    /**

     * True if the state has overview panel visible.

     */