Don't update all apps content visibility during home animation (4feff8ba) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ import android.graphics.Rect;
		import android.graphics.RectF;
		import android.graphics.Region;
		import android.os.UserHandle;
		import android.util.Log;
		import android.view.MotionEvent;
		import android.view.View;
		import android.view.animation.Interpolator;
		@@ -58,7 +57,6 @@ import com.android.launcher3.LauncherStateManager;
		import com.android.launcher3.allapps.DiscoveryBounce;
		import com.android.launcher3.anim.AnimatorPlaybackController;
		import com.android.launcher3.anim.AnimatorSetBuilder;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.uioverrides.states.OverviewState;
		import com.android.launcher3.userevent.nano.LauncherLogProto;
		import com.android.launcher3.views.FloatingIconView;
		@@ -174,6 +172,8 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe
		AnimatorSetBuilder builder = new AnimatorSetBuilder();
		// setRecentsAttachedToAppWindow() will animate recents out.
		builder.addFlag(AnimatorSetBuilder.FLAG_DONT_ANIMATE_OVERVIEW);
		// We want to keep all apps content as GONE to avoid relayout during home animation.
		builder.addFlag(AnimatorSetBuilder.FLAG_DONT_UPDATE_ALL_APPS_VISIBILITY);
		stateManager.createAtomicAnimation(BACKGROUND_APP, NORMAL, builder, ANIM_ALL, 0);
		builder.build().start();

src/com/android/launcher3/allapps/AllAppsRecyclerView.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -26,13 +26,14 @@ import android.util.SparseIntArray;
		import android.view.MotionEvent;
		import android.view.View;

		import androidx.recyclerview.widget.RecyclerView;

		import com.android.launcher3.BaseRecyclerView;
		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.ItemInfo;
		import com.android.launcher3.Launcher;
		import com.android.launcher3.LauncherAppState;
		import com.android.launcher3.R;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.compat.AccessibilityManagerCompat;
		import com.android.launcher3.logging.StatsLogUtils.LogContainerProvider;
		import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
		@@ -41,8 +42,6 @@ import com.android.launcher3.views.RecyclerViewFastScroller;

		import java.util.List;

		import androidx.recyclerview.widget.RecyclerView;

		/**
		* A RecyclerView with custom fast scroll support for the all apps view.
		*/

src/com/android/launcher3/allapps/AllAppsTransitionController.java

+10 −3

Original line number	Diff line number	Diff line
		package com.android.launcher3.allapps;

		import static android.view.View.ALPHA;

		import static com.android.launcher3.LauncherState.ALL_APPS_CONTENT;
		import static com.android.launcher3.LauncherState.ALL_APPS_HEADER_EXTRA;
		import static com.android.launcher3.LauncherState.BACKGROUND_APP;
		@@ -10,6 +12,7 @@ import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
		import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_HEADER_FADE;
		import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
		import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
		import static com.android.launcher3.anim.AnimatorSetBuilder.FLAG_DONT_UPDATE_ALL_APPS_VISIBILITY;
		import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
		import static com.android.launcher3.anim.Interpolators.LINEAR;
		import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
		@@ -18,7 +21,7 @@ import static com.android.launcher3.util.SystemUiController.UI_STATE_ALL_APPS;
		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.util.FloatProperty;
		import android.util.Log;
		import android.view.View;
		import android.view.animation.Interpolator;

		import com.android.launcher3.DeviceProfile;
		@@ -32,7 +35,6 @@ import com.android.launcher3.anim.AnimationSuccessListener;
		import com.android.launcher3.anim.AnimatorSetBuilder;
		import com.android.launcher3.anim.PropertySetter;
		import com.android.launcher3.anim.SpringObjectAnimator;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.util.Themes;
		import com.android.launcher3.views.ScrimView;

		@@ -213,7 +215,12 @@ public class AllAppsTransitionController implements StateHandler, OnDeviceProfil

		Interpolator allAppsFade = builder.getInterpolator(ANIM_ALL_APPS_FADE, LINEAR);
		Interpolator headerFade = builder.getInterpolator(ANIM_ALL_APPS_HEADER_FADE, allAppsFade);
		setter.setViewAlpha(mAppsView.getContentView(), hasAllAppsContent ? 1 : 0, allAppsFade);
		View allAppsContent = mAppsView.getContentView();
		if (!hasAllAppsContent && builder.hasFlag(FLAG_DONT_UPDATE_ALL_APPS_VISIBILITY)) {
		setter.setFloat(allAppsContent, ALPHA, 0, allAppsFade);
		} else {
		setter.setViewAlpha(allAppsContent, hasAllAppsContent ? 1 : 0, allAppsFade);
		}
		setter.setViewAlpha(mAppsView.getScrollBar(), hasAllAppsContent ? 1 : 0, allAppsFade);
		mAppsView.getFloatingHeaderView().setContentVisibility(hasHeaderExtra, hasAllAppsContent,
		setter, headerFade, allAppsFade);

src/com/android/launcher3/anim/AnimatorSetBuilder.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ public class AnimatorSetBuilder {
		public static final int ANIM_ALL_APPS_HEADER_FADE = 12; // e.g. predictions

		public static final int FLAG_DONT_ANIMATE_OVERVIEW = 1 << 0;
		public static final int FLAG_DONT_UPDATE_ALL_APPS_VISIBILITY = 1 << 1;

		protected final ArrayList<Animator> mAnims = new ArrayList<>();