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

Commit 1f1d884e authored by Sunny Goyal's avatar Sunny Goyal Committed by android-build-merger
Browse files

Merge "Some improvements to home to overview transition for 0 button mode" into ub-launcher3-qt-dev 

am: 676a795e

Change-Id: I53934e62baf6b3c7e9561dd05adbbc9f73460230
parents 862712f5 676a795e

go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java

+0 −19
Original line number Diff line number Diff line
@@ -16,11 +16,6 @@ 


package com.android.launcher3.uioverrides;



import static android.view.View.VISIBLE;

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



import android.view.View;



import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherStateManager.StateHandler;
@@ -43,8 +38,6 @@ import java.util.ArrayList; 
public abstract class RecentsUiFactory {



    public static final boolean GO_LOW_RAM_RECENTS_ENABLED = true;

    // Scale recents takes before animating in

    private static final float RECENTS_PREPARE_SCALE = 1.33f;



    public static TouchController[] createTouchControllers(Launcher launcher) {

        ArrayList<TouchController> list = new ArrayList<>();
@@ -76,18 +69,6 @@ public abstract class RecentsUiFactory { 
        return new RecentsViewStateController(launcher);

    }



    /**

     * Prepare the recents view to animate in.

     *

     * @param launcher the launcher activity

     */

    public static void prepareToShowOverview(Launcher launcher) {

        View overview = launcher.getOverviewPanel();

        if (overview.getVisibility() != VISIBLE) {

            SCALE_PROPERTY.set(overview, RECENTS_PREPARE_SCALE);

        }

    }



    /**

     * Clean-up logic that occurs when recents is no longer in use/visible.

     *

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

+40 −0
Original line number Diff line number Diff line
@@ -16,15 +16,31 @@ 


package com.android.launcher3.uioverrides.states;



import static android.view.View.VISIBLE;



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

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_TRANSLATE_X;

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_2;

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

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

import static com.android.launcher3.states.RotationHelper.REQUEST_ROTATE;



import android.view.View;



import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.R;

import com.android.launcher3.anim.AnimatorSetBuilder;

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

import com.android.quickstep.SysUINavigationMode;

import com.android.quickstep.views.IconRecentsView;



/**
@@ -32,6 +48,9 @@ import com.android.quickstep.views.IconRecentsView; 
 */

public class OverviewState extends LauncherState {



    // Scale recents takes before animating in

    private static final float RECENTS_PREPARE_SCALE = 1.33f;



    private static final int STATE_FLAGS = FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED

            | FLAG_DISABLE_RESTORE | FLAG_OVERVIEW_UI | FLAG_DISABLE_ACCESSIBILITY;
@@ -103,6 +122,27 @@ public class OverviewState extends LauncherState { 
        return dp.allAppsCellHeightPx - dp.allAppsIconTextSizePx;

    }



    @Override

    public void prepareForAtomicAnimation(Launcher launcher, LauncherState fromState,

            AnimatorSetBuilder builder) {

        if (fromState == NORMAL && this == OVERVIEW) {

            if (SysUINavigationMode.getMode(launcher) == SysUINavigationMode.Mode.NO_BUTTON) {

                builder.setInterpolator(ANIM_WORKSPACE_SCALE, ACCEL);

                builder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL);

            } else {

                builder.setInterpolator(ANIM_WORKSPACE_SCALE, OVERSHOOT_1_2);

            }

            builder.setInterpolator(ANIM_WORKSPACE_FADE, OVERSHOOT_1_2);

            builder.setInterpolator(ANIM_OVERVIEW_SCALE, OVERSHOOT_1_2);

            builder.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_7);

            builder.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);



            View overview = launcher.getOverviewPanel();

            if (overview.getVisibility() != VISIBLE) {

                SCALE_PROPERTY.set(overview, RECENTS_PREPARE_SCALE);

            }

        }

    }



    public static OverviewState newBackgroundState(int id) {

        return new OverviewState(id);

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java

+0 −21
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.launcher3.uioverrides;



import static android.view.View.VISIBLE;

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

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

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

import static com.android.quickstep.SysUINavigationMode.Mode.NO_BUTTON;
@@ -62,9 +60,6 @@ public abstract class RecentsUiFactory { 
    private static final AsyncCommand SET_SHELF_HEIGHT_CMD = (visible, height) ->

            WindowManagerWrapper.getInstance().setShelfHeight(visible != 0, height);



    // Scale recents takes before animating in

    private static final float RECENTS_PREPARE_SCALE = 1.33f;



    public static RotationMode ROTATION_LANDSCAPE = new RotationMode(-90) {

        @Override

        public void mapRect(int left, int top, int right, int bottom, Rect out) {
@@ -188,22 +183,6 @@ public abstract class RecentsUiFactory { 
        return new RecentsViewStateController(launcher);

    }



    /**

     * Prepare the recents view to animate in.

     *

     * @param launcher the launcher activity

     */

    public static void prepareToShowOverview(Launcher launcher) {

        if (SysUINavigationMode.getMode(launcher) == NO_BUTTON) {

            // Overview lives on the side, so doesn't scale in from above.

            return;

        }

        RecentsView overview = launcher.getOverviewPanel();

        if (overview.getVisibility() != VISIBLE || overview.getContentAlpha() == 0) {

            SCALE_PROPERTY.set(overview, RECENTS_PREPARE_SCALE);

        }

    }



    /**

     * Recents logic that triggers when launcher state changes or launcher activity stops/resumes.

     *

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

+16 −0
Original line number Diff line number Diff line
@@ -14,8 +14,15 @@ 
 * limitations under the License.

 */

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_TRANSLATE_X;

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

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



import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.R;

import com.android.launcher3.anim.AnimatorSetBuilder;



public class OverviewPeekState extends OverviewState {

    public OverviewPeekState(int id) {
@@ -29,4 +36,13 @@ public class OverviewPeekState extends OverviewState { 
                - launcher.getResources().getDimension(R.dimen.overview_peek_distance);

        return result;

    }



    @Override

    public void prepareForAtomicAnimation(Launcher launcher, LauncherState fromState,

            AnimatorSetBuilder builder) {

        if (this == OVERVIEW_PEEK && fromState == NORMAL) {

            builder.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT);

            builder.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_7);

        }

    }

}

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

+41 −0
Original line number Diff line number Diff line
@@ -15,8 +15,20 @@ 
 */

package com.android.launcher3.uioverrides.states;



import static android.view.View.VISIBLE;



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

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_TRANSLATE_X;

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_2;

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

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

import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;

import static com.android.launcher3.states.RotationHelper.REQUEST_ROTATE;
@@ -30,8 +42,11 @@ import com.android.launcher3.LauncherState; 
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;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;
@@ -40,6 +55,9 @@ import com.android.quickstep.views.TaskView; 
 */

public class OverviewState extends LauncherState {



    // Scale recents takes before animating in

    private static final float RECENTS_PREPARE_SCALE = 1.33f;



    protected static final Rect sTempRect = new Rect();



    private static final int STATE_FLAGS = FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED
@@ -160,6 +178,29 @@ public class OverviewState extends LauncherState { 
        }

    }



    @Override

    public void prepareForAtomicAnimation(Launcher launcher, LauncherState fromState,

            AnimatorSetBuilder builder) {

        if (fromState == NORMAL && this == OVERVIEW) {

            if (SysUINavigationMode.getMode(launcher) == SysUINavigationMode.Mode.NO_BUTTON) {

                builder.setInterpolator(ANIM_WORKSPACE_SCALE, ACCEL);

                builder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL);

            } else {

                builder.setInterpolator(ANIM_WORKSPACE_SCALE, OVERSHOOT_1_2);



                // Scale up the recents, if it is not coming from the side

                RecentsView overview = launcher.getOverviewPanel();

                if (overview.getVisibility() != VISIBLE || overview.getContentAlpha() == 0) {

                    SCALE_PROPERTY.set(overview, RECENTS_PREPARE_SCALE);

                }

            }

            builder.setInterpolator(ANIM_WORKSPACE_FADE, OVERSHOOT_1_2);

            builder.setInterpolator(ANIM_OVERVIEW_SCALE, OVERSHOOT_1_2);

            builder.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_7);

            builder.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);

        }

    }



    public static OverviewState newBackgroundState(int id) {

        return new BackgroundAppState(id);

    }