Merge "Implement all apps discovery bounce." into ub-launcher3-edmonton (8b5c7d93) · Commits · e / os / android_packages_apps_Trebuchet

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

+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

+13 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,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.quickstep.util.LayoutUtils;
		import com.android.quickstep.util.RemoteAnimationProvider;
		@@ -78,6 +79,8 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> {

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

		void onOverviewShown(T activity);

		@Nullable
		T getCreatedActivity();

		@@ -210,6 +213,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() {
		@@ -364,6 +372,11 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> {
		return new RecentsActivityTracker(onInitListener);
		}

		@Override
		public void onOverviewShown(RecentsActivity activity) {
		// Do nothing.
		}

		@Nullable
		@Override
		public RecentsActivity getCreatedActivity() {

+1 −0

Original line number	Diff line number	Diff line
		@@ -695,6 +695,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
		finishTransitionRunnable.run();
		}
		RecentsModel.getInstance(mContext).onOverviewShown(false, TAG);
		mActivityControlHelper.onOverviewShown(mActivity);
		doLogGesture(true /* toLauncher */);
		}

+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();
		}