Merge "Fades out Assistant when entering Overview." into ub-launcher3-master (6a3a0994) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/util/AppWindowAnimationHelper.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -35,10 +35,11 @@ import com.android.launcher3.BaseDraggingActivity;
		import com.android.launcher3.DeviceProfile;
		import com.android.launcher3.LauncherState;
		import com.android.launcher3.R;
		import com.android.quickstep.RemoteAnimationTargets;
		import com.android.quickstep.SystemUiProxy;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.anim.Interpolators;
		import com.android.launcher3.views.BaseDragLayer;
		import com.android.quickstep.RemoteAnimationTargets;
		import com.android.quickstep.SystemUiProxy;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskThumbnailView;
		import com.android.quickstep.views.TaskView;
		@@ -200,6 +201,11 @@ public class AppWindowAnimationHelper {
		}
		mCurrentCornerRadius = cornerRadius;
		}
		// Fade out Assistant overlay.
		if (app.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_ASSISTANT
		&& app.isNotInRecents) {
		alpha = 1 - Interpolators.DEACCEL_2_5.getInterpolation(progress);
		}
		} else if (params.targetSet.hasRecents) {
		// If home has a different target then recents, reverse anim the
		// home target.