Merge "Fixing exception when applying transaction while the surface is... (19fc8b6a) · Commits · e / os / BlissLauncher3

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -33,11 +33,11 @@ import com.android.launcher3.anim.PendingAnimation;
		import com.android.launcher3.statehandlers.DepthController;
		import com.android.launcher3.statemanager.StatefulActivity;
		import com.android.quickstep.util.RemoteAnimationProvider;
		import com.android.quickstep.util.SurfaceTransactionApplier;
		import com.android.quickstep.util.TaskViewSimulator;
		import com.android.quickstep.util.TransformParams;
		import com.android.quickstep.views.RecentsView;
		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
		import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;

		/**
		* Provider for the atomic (for 3-button mode) remote window animation from the app to the overview.
		@@ -132,8 +132,7 @@ final class AppToOverviewAnimationProvider<T extends StatefulActivity<?>> extend

		TransformParams params = new TransformParams()
		.setTargetSet(targets)
		.setSyncTransactionApplier(
		new SyncRtSurfaceTransactionApplierCompat(mActivity.getRootView()));
		.setSyncTransactionApplier(new SurfaceTransactionApplier(mActivity.getRootView()));

		AnimatedFloat recentsAlpha = new AnimatedFloat(() -> { });
		params.setBaseBuilderProxy((builder, app, p)

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

+15 −3

Original line number	Diff line number	Diff line
		@@ -40,13 +40,14 @@ import com.android.launcher3.util.WindowBounds;
		import com.android.quickstep.RecentsAnimationCallbacks.RecentsAnimationListener;
		import com.android.quickstep.util.ActiveGestureLog;
		import com.android.quickstep.util.ActivityInitListener;
		import com.android.quickstep.util.RectFSpringAnim;
		import com.android.quickstep.util.SurfaceTransactionApplier;
		import com.android.quickstep.util.TransformParams;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;
		import com.android.systemui.shared.recents.model.ThumbnailData;
		import com.android.systemui.shared.system.InputConsumerController;
		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
		import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;

		import java.util.ArrayList;
		import java.util.function.Consumer;
		@@ -114,10 +115,10 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
		public abstract Intent getLaunchIntent();

		protected void linkRecentsViewScroll() {
		SyncRtSurfaceTransactionApplierCompat.create(mRecentsView, applier -> {
		SurfaceTransactionApplier.create(mRecentsView, applier -> {
		mTransformParams.setSyncTransactionApplier(applier);
		runOnRecentsAnimationStart(() ->
		mRecentsAnimationTargets.addDependentTransactionApplier(applier));
		mRecentsAnimationTargets.addReleaseCheck(applier));
		});

		mRecentsView.setOnScrollChangeListener((v, scrollX, scrollY, oldScrollX, oldScrollY) -> {
		@@ -365,6 +366,17 @@ public abstract class BaseSwipeUpHandler<T extends StatefulActivity<?>, Q extend
		}
		}

		@Override
		protected RectFSpringAnim createWindowAnimationToHome(float startProgress,
		HomeAnimationFactory homeAnimationFactory) {
		RectFSpringAnim anim =
		super.createWindowAnimationToHome(startProgress, homeAnimationFactory);
		if (mRecentsAnimationTargets != null) {
		mRecentsAnimationTargets.addReleaseCheck(anim);
		}
		return anim;
		}

		public interface Factory {

		BaseSwipeUpHandler newHandler(

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import com.android.launcher3.anim.PendingAnimation;
		import com.android.launcher3.model.data.ItemInfo;
		import com.android.launcher3.statehandlers.DepthController;
		import com.android.launcher3.util.DefaultDisplay;
		import com.android.quickstep.util.SurfaceTransactionApplier;
		import com.android.quickstep.util.TaskViewSimulator;
		import com.android.quickstep.util.TransformParams;
		import com.android.quickstep.views.RecentsView;
		@@ -49,7 +50,6 @@ import com.android.quickstep.views.TaskThumbnailView;
		import com.android.quickstep.views.TaskView;
		import com.android.systemui.shared.recents.model.Task;
		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
		import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;

		/**
		* Utility class for helpful methods related to {@link TaskView} objects and their tasks.
		@@ -128,11 +128,10 @@ public final class TaskViewUtils {
		RemoteAnimationTargetCompat[] wallpaperTargets, DepthController depthController,
		PendingAnimation out) {

		SyncRtSurfaceTransactionApplierCompat applier =
		new SyncRtSurfaceTransactionApplierCompat(v);
		SurfaceTransactionApplier applier = new SurfaceTransactionApplier(v);
		final RemoteAnimationTargets targets =
		new RemoteAnimationTargets(appTargets, wallpaperTargets, MODE_OPENING);
		targets.addDependentTransactionApplier(applier);
		targets.addReleaseCheck(applier);

		TransformParams params = new TransformParams()
		.setSyncTransactionApplier(applier)

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import com.android.launcher3.R;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.anim.FlingSpringAnim;
		import com.android.launcher3.util.DynamicResource;
		import com.android.quickstep.RemoteAnimationTargets.ReleaseCheck;
		import com.android.systemui.plugins.ResourceProvider;

		import java.util.ArrayList;
		@@ -39,7 +40,7 @@ import java.util.List;
		* Applies spring forces to animate from a starting rect to a target rect,
		* while providing update callbacks to the caller.
		*/
		public class RectFSpringAnim {
		public class RectFSpringAnim extends ReleaseCheck {

		private static final FloatPropertyCompat<RectFSpringAnim> RECT_CENTER_X =
		new FloatPropertyCompat<RectFSpringAnim>("rectCenterXSpring") {
		@@ -116,6 +117,7 @@ public class RectFSpringAnim {
		ResourceProvider rp = DynamicResource.provider(context);
		mMinVisChange = rp.getDimension(R.dimen.swipe_up_fling_min_visible_change);
		mYOvershoot = rp.getDimension(R.dimen.swipe_up_y_overshoot);
		setCanRelease(true);
		}

		public void onTargetPositionChanged() {
		@@ -190,10 +192,12 @@ public class RectFSpringAnim {
		maybeOnEnd();
		});

		setCanRelease(false);
		mAnimsStarted = true;

		mRectXAnim.start();
		mRectYAnim.start();
		mRectScaleAnim.start();
		mAnimsStarted = true;
		for (Animator.AnimatorListener animatorListener : mAnimatorListeners) {
		animatorListener.onAnimationStart(null);
		}
		@@ -245,6 +249,7 @@ public class RectFSpringAnim {
		private void maybeOnEnd() {
		if (mAnimsStarted && isEnded()) {
		mAnimsStarted = false;
		setCanRelease(true);
		for (Animator.AnimatorListener animatorListener : mAnimatorListeners) {
		animatorListener.onAnimationEnd(null);
		}

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

0 → 100644

+136 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.quickstep.util;

		import static com.android.systemui.shared.system.TransactionCompat.deferTransactionUntil;
		import static com.android.systemui.shared.system.TransactionCompat.setEarlyWakeup;

		import android.annotation.TargetApi;
		import android.os.Build;
		import android.os.Handler;
		import android.os.Message;
		import android.view.SurfaceControl;
		import android.view.SurfaceControl.Transaction;
		import android.view.View;

		import com.android.quickstep.RemoteAnimationTargets.ReleaseCheck;
		import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
		import com.android.systemui.shared.system.ViewRootImplCompat;

		import java.util.function.Consumer;


		/**
		* Helper class to apply surface transactions in sync with RenderThread similar to
		* android.view.SyncRtSurfaceTransactionApplier
		* with some Launcher specific utility methods
		*/
		@TargetApi(Build.VERSION_CODES.R)
		public class SurfaceTransactionApplier extends ReleaseCheck {

		private static final int MSG_UPDATE_SEQUENCE_NUMBER = 0;

		private final SurfaceControl mBarrierSurfaceControl;
		private final ViewRootImplCompat mTargetViewRootImpl;
		private final Handler mApplyHandler;

		private int mLastSequenceNumber = 0;

		/**
		* @param targetView The view in the surface that acts as synchronization anchor.
		*/
		public SurfaceTransactionApplier(View targetView) {
		mTargetViewRootImpl = new ViewRootImplCompat(targetView);
		mBarrierSurfaceControl = mTargetViewRootImpl.getRenderSurfaceControl();
		mApplyHandler = new Handler(this::onApplyMessage);
		}

		protected boolean onApplyMessage(Message msg) {
		if (msg.what == MSG_UPDATE_SEQUENCE_NUMBER) {
		setCanRelease(msg.arg1 == mLastSequenceNumber);
		return true;
		}
		return false;
		}

		/**
		* Schedules applying surface parameters on the next frame.
		*
		* @param params The surface parameters to apply. DO NOT MODIFY the list after passing into
		* this method to avoid synchronization issues.
		*/
		public void scheduleApply(final SurfaceParams... params) {
		View view = mTargetViewRootImpl.getView();
		if (view == null) {
		return;
		}

		mLastSequenceNumber++;
		final int toApplySeqNo = mLastSequenceNumber;
		setCanRelease(false);
		mTargetViewRootImpl.registerRtFrameCallback(frame -> {
		if (mBarrierSurfaceControl == null \|\| !mBarrierSurfaceControl.isValid()) {
		Message.obtain(mApplyHandler, MSG_UPDATE_SEQUENCE_NUMBER, toApplySeqNo, 0)
		.sendToTarget();
		return;
		}
		Transaction t = new Transaction();
		for (int i = params.length - 1; i >= 0; i--) {
		SurfaceParams surfaceParams = params[i];
		if (surfaceParams.surface.isValid()) {
		deferTransactionUntil(t, surfaceParams.surface, mBarrierSurfaceControl, frame);
		surfaceParams.applyTo(t);
		}
		}
		setEarlyWakeup(t);
		t.apply();
		Message.obtain(mApplyHandler, MSG_UPDATE_SEQUENCE_NUMBER, toApplySeqNo, 0)
		.sendToTarget();
		});

		// Make sure a frame gets scheduled.
		view.invalidate();
		}

		/**
		* Creates an instance of SyncRtSurfaceTransactionApplier, deferring until the target view is
		* attached if necessary.
		*/
		public static void create(
		final View targetView, final Consumer<SurfaceTransactionApplier> callback) {
		if (targetView == null) {
		// No target view, no applier
		callback.accept(null);
		} else if (new ViewRootImplCompat(targetView).isValid()) {
		// Already attached, we're good to go
		callback.accept(new SurfaceTransactionApplier(targetView));
		} else {
		// Haven't been attached before we can get the view root
		targetView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
		@Override
		public void onViewAttachedToWindow(View v) {
		targetView.removeOnAttachStateChangeListener(this);
		callback.accept(new SurfaceTransactionApplier(targetView));
		}

		@Override
		public void onViewDetachedFromWindow(View v) {
		// Do nothing
		}
		});
		}
		}
		}