Merge "Updated overview exit animation for 3 button navigation" into tm-qpr-dev (9860628f) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/uioverrides/states/QuickstepAtomicAnimationFactory.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -113,11 +113,6 @@ public class QuickstepAtomicAnimationFactory extends
		config.setInterpolator(ANIM_OVERVIEW_FADE, FINAL_FRAME);
		config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, EMPHASIZED_DECELERATE);
		config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, FINAL_FRAME);
		} else {
		config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL);
		config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f));
		config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
		}

		// Scroll RecentsView to page 0 as it goes offscreen, if necessary.
		int numPagesToScroll = overview.getNextPage() - DEFAULT_PAGE;
		@@ -125,6 +120,11 @@ public class QuickstepAtomicAnimationFactory extends
		numPagesToScroll * PER_PAGE_SCROLL_DURATION);
		config.duration = Math.max(config.duration, scrollDuration);
		overview.snapToPage(DEFAULT_PAGE, Math.toIntExact(config.duration));
		} else {
		config.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, ACCEL_DEACCEL);
		config.setInterpolator(ANIM_OVERVIEW_SCALE, clampToProgress(ACCEL, 0, 0.9f));
		config.setInterpolator(ANIM_OVERVIEW_FADE, DEACCEL_1_7);
		}

		Workspace<?> workspace = mActivity.getWorkspace();
		// Start from a higher workspace scale, but only if we're invisible so we don't jump.