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

Commit e5575f9f authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Implement all apps discovery bounce. 

Mock: https://docs.google.com/presentation/d/1TCp1mREgsFAWq4hCnUaSRCpaqvDbzCVkN1mJuRMylIg/edit#slide=id.g36a3e190fb_0_6

Demo video: go/shelf_bounce_animation

Fixes: 70180942
Test: manual test
Change-Id: I6ecceb63612dd63cea62f2e6cb19d7522f3d76e0
parent fed15f19

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

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
package com.android.launcher3.uioverrides;



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

import static com.android.launcher3.allapps.DiscoveryBounce.APPS_VIEW_SHOWN;

import static com.android.launcher3.allapps.DiscoveryBounce.SHELF_BOUNCE_SEEN;

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



import android.view.View;
@@ -47,8 +47,8 @@ public class AllAppsState extends LauncherState { 


    @Override

    public void onStateEnabled(Launcher launcher) {

        if (!launcher.getSharedPrefs().getBoolean(APPS_VIEW_SHOWN, false)) {

            launcher.getSharedPrefs().edit().putBoolean(APPS_VIEW_SHOWN, true).apply();

        if (!launcher.getSharedPrefs().getBoolean(SHELF_BOUNCE_SEEN, false)) {

            launcher.getSharedPrefs().edit().putBoolean(SHELF_BOUNCE_SEEN, true).apply();

        }



        AbstractFloatingView.closeAllOpenViews(launcher);

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

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package com.android.launcher3.uioverrides;



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

import static com.android.launcher3.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN;

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

import static com.android.launcher3.states.RotationHelper.REQUEST_ROTATE;
@@ -25,6 +26,7 @@ import com.android.launcher3.AbstractFloatingView; 
import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherState;

import com.android.launcher3.allapps.DiscoveryBounce;

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

import com.android.quickstep.views.RecentsView;
@@ -57,6 +59,10 @@ public class OverviewState extends LauncherState { 


    @Override

    public void onStateEnabled(Launcher launcher) {

        if (!launcher.getSharedPrefs().getBoolean(HOME_BOUNCE_SEEN, false)) {

            launcher.getSharedPrefs().edit().putBoolean(HOME_BOUNCE_SEEN, true).apply();

        }



        RecentsView rv = launcher.getOverviewPanel();

        rv.setOverviewStateEnabled(true);

        AbstractFloatingView.closeAllOpenViews(launcher);
@@ -71,6 +77,7 @@ public class OverviewState extends LauncherState { 
    @Override

    public void onStateTransitionEnd(Launcher launcher) {

        launcher.getRotationHelper().setCurrentStateRequest(REQUEST_ROTATE);

        DiscoveryBounce.showForOverviewIfNeeded(launcher);

    }



    @Override

quickstep/src/com/android/quickstep/ActivityControlHelper.java

+13 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.launcher3.LauncherAppState; 
import com.android.launcher3.LauncherInitListener;

import com.android.launcher3.LauncherState;

import com.android.launcher3.allapps.AllAppsTransitionController;

import com.android.launcher3.allapps.DiscoveryBounce;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.util.ViewOnDrawExecutor;

import com.android.quickstep.util.LayoutUtils;
@@ -83,6 +84,8 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { 


    ActivityInitListener createActivityInitListener(BiPredicate<T, Boolean> onInitListener);



    void onOverviewShown(T activity);



    @Nullable

    T getCreatedActivity();
@@ -225,6 +228,11 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { 
            return new LauncherInitListener(onInitListener);

        }



        @Override

        public void onOverviewShown(Launcher launcher) {

            DiscoveryBounce.showForOverviewIfNeeded(launcher);

        }



        @Nullable

        @Override

        public Launcher getCreatedActivity() {
@@ -366,6 +374,11 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { 
            return new RecentsActivityTracker(onInitListener);

        }



        @Override

        public void onOverviewShown(RecentsActivity activity) {

            // Do nothing.

        }



        @Nullable

        @Override

        public RecentsActivity getCreatedActivity() {

quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java

+1 −0
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> { 
            finishTransitionRunnable.run();

        }

        RecentsModel.getInstance(mContext).onOverviewShown(false, TAG);

        mActivityControlHelper.onOverviewShown(mActivity);

        doLogGesture(true /* toLauncher */);

    }

src/com/android/launcher3/Launcher.java

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ public class Launcher extends BaseDraggingActivity 
        // Refresh shortcuts if the permission changed.

        mModel.refreshShortcutsIfRequired();



        DiscoveryBounce.showIfNeeded(this);

        DiscoveryBounce.showForHomeIfNeeded(this);

        if (mLauncherCallbacks != null) {

            mLauncherCallbacks.onResume();

        }