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

Commit 6e4058c5 authored Feb 13, 2019 by Tracy Zhou Committed by Android (Google) Code Review Feb 13, 2019

Merge "Fix live tile regression in quick switch mode" into ub-launcher3-master

parents 5387c110 f11ffc74

quickstep/src/com/android/quickstep/QuickScrubController.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -267,6 +267,10 @@ public class QuickScrubController implements OnAlarmListener {
		return mWaitingForTaskLaunch;
		}

		public boolean hasFinishedTransitionToQuickScrub() {
		return mFinishedTransitionToQuickScrub;
		}

		/**
		* Attempts to go to normal overview or back to home, so UI doesn't prevent user interaction.
		*/

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -700,7 +700,9 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		}

		if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
		if (mRecentsAnimationWrapper.getController() != null && mLayoutListener != null) {
		if (mRecentsAnimationWrapper.getController() != null && mLayoutListener != null &&
		(mInteractionType == INTERACTION_NORMAL
		\|\| !mQuickScrubController.hasFinishedTransitionToQuickScrub())) {
		mLayoutListener.open();
		mLayoutListener.update(mCurrentShift.value > 1, mLongSwipeMode,
		mClipAnimationHelper.getCurrentRectWithInsets(),

quickstep/src/com/android/quickstep/views/LauncherRecentsView.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -216,8 +216,12 @@ public class LauncherRecentsView extends RecentsView<Launcher> {
		int offsetY = (int) (mTaskHeight * taskView.getScaleY() * getScaleY()
		- mTempRect.height());
		if (((mCurrentPage != 0) \|\| mightNeedToRefill) && offsetX > 0) {
		if (mTempRect.left - offsetX < 0) {
		mTempRect.left -= offsetX;
		} else {
		mTempRect.right += offsetX;
		}
		}
		if (mightNeedToRefill && offsetY > 0) {
		mTempRect.top -= offsetY;
		}