Merge "Adding all-apps onboarding popup for 2-button mode" (fc713271) · Commits · e / os / android_packages_apps_Trebuchet

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ import com.android.launcher3.uioverrides.touchcontrollers.QuickSwitchTouchContro
		import com.android.launcher3.uioverrides.touchcontrollers.StatusBarTouchController;
		import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController;
		import com.android.launcher3.uioverrides.touchcontrollers.TransposedQuickSwitchTouchController;
		import com.android.launcher3.uioverrides.touchcontrollers.TwoButtonNavbarToOverviewTouchController;
		import com.android.launcher3.uioverrides.touchcontrollers.TwoButtonNavbarTouchController;
		import com.android.launcher3.util.OnboardingPrefs;
		import com.android.launcher3.util.TouchController;
		import com.android.launcher3.util.UiThreadHelper;
		@@ -285,7 +285,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
		list.add(new NoButtonNavbarToOverviewTouchController(this));
		break;
		case TWO_BUTTONS:
		list.add(new TwoButtonNavbarToOverviewTouchController(this));
		list.add(new TwoButtonNavbarTouchController(this));
		list.add(getDeviceProfile().isVerticalBarLayout()
		? new TransposedQuickSwitchTouchController(this)
		: new QuickSwitchTouchController(this));

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarToOverviewTouchController.java→quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TwoButtonNavbarTouchController.java

+54 −5

Original line number	Diff line number	Diff line
		@@ -15,10 +15,13 @@
		*/
		package com.android.launcher3.uioverrides.touchcontrollers;

		import static com.android.launcher3.AbstractFloatingView.TYPE_ALL_APPS_EDU;
		import static com.android.launcher3.AbstractFloatingView.getOpenView;
		import static com.android.launcher3.LauncherState.NORMAL;
		import static com.android.launcher3.LauncherState.OVERVIEW;
		import static com.android.launcher3.Utilities.EDGE_NAV_BAR;

		import android.animation.ValueAnimator;
		import android.view.MotionEvent;

		import com.android.launcher3.AbstractFloatingView;
		@@ -28,42 +31,79 @@ import com.android.launcher3.states.StateAnimationConfig.AnimationFlags;
		import com.android.launcher3.touch.AbstractStateChangeTouchController;
		import com.android.launcher3.touch.SingleAxisSwipeDetector;
		import com.android.quickstep.SystemUiProxy;
		import com.android.quickstep.views.AllAppsEduView;

		/**
		* Touch controller for handling edge swipes in 2-button mode
		*/
		public class TwoButtonNavbarToOverviewTouchController extends AbstractStateChangeTouchController {
		public class TwoButtonNavbarTouchController extends AbstractStateChangeTouchController {

		private static final int MAX_NUM_SWIPES_TO_TRIGGER_EDU = 3;

		private static final String TAG = "2BtnNavbarTouchCtrl";

		public TwoButtonNavbarToOverviewTouchController(Launcher l) {
		private final boolean mIsTransposed;

		// If true, we will finish the current animation instantly on second touch.
		private boolean mFinishFastOnSecondTouch;

		private int mContinuousTouchCount = 0;

		public TwoButtonNavbarTouchController(Launcher l) {
		super(l, l.getDeviceProfile().isVerticalBarLayout()
		? SingleAxisSwipeDetector.HORIZONTAL : SingleAxisSwipeDetector.VERTICAL);
		mIsTransposed = l.getDeviceProfile().isVerticalBarLayout();
		}

		@Override
		protected boolean canInterceptTouch(MotionEvent ev) {
		boolean canIntercept = canInterceptTouchInternal(ev);
		if (!canIntercept) {
		mContinuousTouchCount = 0;
		}
		return canIntercept;
		}

		private boolean canInterceptTouchInternal(MotionEvent ev) {
		if (mCurrentAnimation != null) {
		if (mFinishFastOnSecondTouch) {
		mCurrentAnimation.getAnimationPlayer().end();
		}

		// If we are already animating from a previous state, we can intercept.
		return true;
		}
		if (AbstractFloatingView.getTopOpenView(mLauncher) != null) {
		return false;
		}
		return mLauncher.isInState(NORMAL) && (ev.getEdgeFlags() & EDGE_NAV_BAR) != 0;
		if ((ev.getEdgeFlags() & EDGE_NAV_BAR) == 0) {
		return false;
		}
		if (!mIsTransposed && mLauncher.isInState(OVERVIEW)) {
		return true;
		}
		return mLauncher.isInState(NORMAL);
		}

		@Override
		protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
		if (mLauncher.getDeviceProfile().isVerticalBarLayout()) {
		if (mIsTransposed) {
		boolean draggingFromNav =
		mLauncher.getDeviceProfile().isSeascape() == isDragTowardPositive;
		return draggingFromNav ? OVERVIEW : NORMAL;
		} else {
		return isDragTowardPositive ? OVERVIEW : NORMAL;
		return isDragTowardPositive ^ (fromState == OVERVIEW) ? OVERVIEW : NORMAL;
		}
		}

		@Override
		protected void updateSwipeCompleteAnimation(ValueAnimator animator, long expectedDuration,
		LauncherState targetState, float velocity, boolean isFling) {
		super.updateSwipeCompleteAnimation(animator, expectedDuration, targetState,
		velocity, isFling);
		mFinishFastOnSecondTouch = !mIsTransposed && mFromState == NORMAL;
		}

		@Override
		protected float getShiftRange() {
		return mLauncher.getDeviceProfile().isVerticalBarLayout()
		@@ -82,8 +122,17 @@ public class TwoButtonNavbarToOverviewTouchController extends AbstractStateChang
		@Override
		protected void onSwipeInteractionCompleted(LauncherState targetState) {
		super.onSwipeInteractionCompleted(targetState);
		if (!mIsTransposed) {
		mContinuousTouchCount++;
		}
		if (mStartState == NORMAL && targetState == OVERVIEW) {
		SystemUiProxy.INSTANCE.get(mLauncher).onOverviewShown(true, TAG);
		} else if (targetState == NORMAL
		&& mContinuousTouchCount >= MAX_NUM_SWIPES_TO_TRIGGER_EDU) {
		mContinuousTouchCount = 0;
		if (getOpenView(mLauncher, TYPE_ALL_APPS_EDU) == null) {
		AllAppsEduView.show(mLauncher);
		}
		}
		}
		}

src/com/android/launcher3/util/OnboardingPrefs.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ public class OnboardingPrefs<T extends Launcher> {

		public static final String HOME_BOUNCE_SEEN = "launcher.apps_view_shown";
		public static final String HOME_BOUNCE_COUNT = "launcher.home_bounce_count";
		public static final String SHELF_BOUNCE_COUNT = "launcher.shelf_bounce_count";
		public static final String HOTSEAT_DISCOVERY_TIP_COUNT = "launcher.hotseat_discovery_tip_count";
		public static final String HOTSEAT_LONGPRESS_TIP_SEEN = "launcher.hotseat_longpress_tip_seen";