Merge "[Predictive Back] Revert all apps scale when exiting from search" into tm-qpr-dev (3c86d903) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1342,6 +1342,7 @@ public class Launcher extends StatefulActivity<LauncherState>

		// Setup Apps
		mAppsView = findViewById(R.id.apps_view);
		mAppsView.setAllAppsTransitionController(mAllAppsController);

		// Setup Scrim
		mScrimView = findViewById(R.id.scrim_view);

+9 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
		private int mHeaderColor;
		private int mBottomSheetBackgroundColor;
		private int mTabsProtectionAlpha;
		@Nullable private AllAppsTransitionController mAllAppsTransitionController;

		public ActivityAllAppsContainerView(Context context) {
		this(context, null);
		@@ -292,6 +293,11 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
		animateToSearchState(goingToSearch, DEFAULT_SEARCH_TRANSITION_DURATION_MS);
		}

		public void setAllAppsTransitionController(
		AllAppsTransitionController allAppsTransitionController) {
		mAllAppsTransitionController = allAppsTransitionController;
		}

		private void animateToSearchState(boolean goingToSearch, long durationMs) {
		if (!mSearchTransitionController.isRunning() && goingToSearch == isSearching()) {
		return;
		@@ -299,6 +305,9 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
		if (goingToSearch) {
		// Fade out the button to pause work apps.
		mWorkManager.onActivePageChanged(SEARCH);
		} else if (mAllAppsTransitionController != null) {
		// If exiting search, revert predictive back scale on all apps
		mAllAppsTransitionController.animateAllAppsToNoScale();
		}
		mSearchTransitionController.animateToSearchState(goingToSearch, durationMs,
		/* onEndRunnable = */ () -> {

+7 −0

Original line number	Diff line number	Diff line
		@@ -301,6 +301,13 @@ public class AllAppsTransitionController
		}
		}

		/** Animate all apps view to 1f scale. */
		public void animateAllAppsToNoScale() {
		mAllAppScale.animateToValue(1f)
		.setDuration(REVERT_SWIPE_ALL_APPS_TO_HOME_ANIMATION_DURATION_MS)
		.start();
		}

		/**
		* Creates an animation which updates the vertical transition progress and updates all the
		* dependent UI using various animation events