Snap for 9075788 from 40a0690301 to udc-release
Change-Id: I83d5ba8c248a2f42b3eb37495dc25f499a6f801f
This commit is contained in:
commit
fe3a1680df
28 files changed
+228
-359
No files matched your search
@@ -123,8 +123,6 @@ import com.android.quickstep.util.MultiValueUpdateListener;
|
||||
import com.android.quickstep.util.RectFSpringAnim;
|
||||
import com.android.quickstep.util.RemoteAnimationProvider;
|
||||
import com.android.quickstep.util.StaggeredWorkspaceAnim;
|
||||
import com.android.quickstep.util.SurfaceTransaction;
|
||||
import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties;
|
||||
import com.android.quickstep.util.SurfaceTransactionApplier;
|
||||
import com.android.quickstep.util.WorkspaceRevealAnim;
|
||||
import com.android.quickstep.views.FloatingWidgetView;
|
||||
@@ -137,6 +135,7 @@ import com.android.systemui.shared.system.RemoteAnimationDefinitionCompat;
|
||||
import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
|
||||
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
import com.android.systemui.shared.system.RemoteTransitionCompat;
|
||||
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
|
||||
import com.android.wm.shell.startingsurface.IStartingWindowListener;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -815,11 +814,10 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
return;
|
||||
}
|
||||
|
||||
SurfaceTransaction transaction = new SurfaceTransaction();
|
||||
|
||||
ArrayList<SurfaceParams> params = new ArrayList<>();
|
||||
for (int i = appTargets.length - 1; i >= 0; i--) {
|
||||
RemoteAnimationTargetCompat target = appTargets[i];
|
||||
SurfaceProperties builder = transaction.forSurface(target.leash);
|
||||
SurfaceParams.Builder builder = new SurfaceParams.Builder(target.leash);
|
||||
|
||||
if (target.mode == MODE_OPENING) {
|
||||
matrix.setScale(scale, scale);
|
||||
@@ -840,11 +838,11 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
|
||||
floatingView.update(mIconAlpha.value, 255, floatingIconBounds, percent, 0f,
|
||||
mWindowRadius.value * scale, true /* isOpening */);
|
||||
builder.setMatrix(matrix)
|
||||
.setWindowCrop(crop)
|
||||
.setAlpha(1f - mIconAlpha.value)
|
||||
.setCornerRadius(mWindowRadius.value)
|
||||
.setShadowRadius(mShadowRadius.value);
|
||||
builder.withMatrix(matrix)
|
||||
.withWindowCrop(crop)
|
||||
.withAlpha(1f - mIconAlpha.value)
|
||||
.withCornerRadius(mWindowRadius.value)
|
||||
.withShadowRadius(mShadowRadius.value);
|
||||
} else if (target.mode == MODE_CLOSING) {
|
||||
if (target.localBounds != null) {
|
||||
final Rect localBounds = target.localBounds;
|
||||
@@ -864,26 +862,29 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
tmpPos.y = tmp;
|
||||
}
|
||||
matrix.setTranslate(tmpPos.x, tmpPos.y);
|
||||
builder.setMatrix(matrix)
|
||||
.setWindowCrop(crop)
|
||||
.setAlpha(1f);
|
||||
builder.withMatrix(matrix)
|
||||
.withWindowCrop(crop)
|
||||
.withAlpha(1f);
|
||||
}
|
||||
params.add(builder.build());
|
||||
}
|
||||
|
||||
if (navBarTarget != null) {
|
||||
SurfaceProperties navBuilder =
|
||||
transaction.forSurface(navBarTarget.leash);
|
||||
final SurfaceParams.Builder navBuilder =
|
||||
new SurfaceParams.Builder(navBarTarget.leash);
|
||||
if (mNavFadeIn.value > mNavFadeIn.getStartValue()) {
|
||||
matrix.setScale(scale, scale);
|
||||
matrix.postTranslate(windowTransX0, windowTransY0);
|
||||
navBuilder.setMatrix(matrix)
|
||||
.setWindowCrop(crop)
|
||||
.setAlpha(mNavFadeIn.value);
|
||||
navBuilder.withMatrix(matrix)
|
||||
.withWindowCrop(crop)
|
||||
.withAlpha(mNavFadeIn.value);
|
||||
} else {
|
||||
navBuilder.setAlpha(mNavFadeOut.value);
|
||||
navBuilder.withAlpha(mNavFadeOut.value);
|
||||
}
|
||||
params.add(navBuilder.build());
|
||||
}
|
||||
surfaceApplier.scheduleApply(transaction);
|
||||
|
||||
surfaceApplier.scheduleApply(params.toArray(new SurfaceParams[params.size()]));
|
||||
}
|
||||
};
|
||||
appAnimator.addUpdateListener(listener);
|
||||
@@ -999,33 +1000,37 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
matrix.postScale(mAppWindowScale, mAppWindowScale, widgetBackgroundBounds.left,
|
||||
widgetBackgroundBounds.top);
|
||||
|
||||
SurfaceTransaction transaction = new SurfaceTransaction();
|
||||
ArrayList<SurfaceParams> params = new ArrayList<>();
|
||||
float floatingViewAlpha = appTargetsAreTranslucent ? 1 - mPreviewAlpha.value : 1;
|
||||
for (int i = appTargets.length - 1; i >= 0; i--) {
|
||||
RemoteAnimationTargetCompat target = appTargets[i];
|
||||
SurfaceProperties builder = transaction.forSurface(target.leash);
|
||||
SurfaceParams.Builder builder = new SurfaceParams.Builder(target.leash);
|
||||
if (target.mode == MODE_OPENING) {
|
||||
floatingView.update(widgetBackgroundBounds, floatingViewAlpha,
|
||||
mWidgetForegroundAlpha.value, mWidgetFallbackBackgroundAlpha.value,
|
||||
mCornerRadiusProgress.value);
|
||||
builder.setMatrix(matrix)
|
||||
.setWindowCrop(appWindowCrop)
|
||||
.setAlpha(mPreviewAlpha.value)
|
||||
.setCornerRadius(mWindowRadius.value / mAppWindowScale);
|
||||
builder.withMatrix(matrix)
|
||||
.withWindowCrop(appWindowCrop)
|
||||
.withAlpha(mPreviewAlpha.value)
|
||||
.withCornerRadius(mWindowRadius.value / mAppWindowScale);
|
||||
}
|
||||
params.add(builder.build());
|
||||
}
|
||||
|
||||
if (navBarTarget != null) {
|
||||
SurfaceProperties navBuilder = transaction.forSurface(navBarTarget.leash);
|
||||
final SurfaceParams.Builder navBuilder =
|
||||
new SurfaceParams.Builder(navBarTarget.leash);
|
||||
if (mNavFadeIn.value > mNavFadeIn.getStartValue()) {
|
||||
navBuilder.setMatrix(matrix)
|
||||
.setWindowCrop(appWindowCrop)
|
||||
.setAlpha(mNavFadeIn.value);
|
||||
navBuilder.withMatrix(matrix)
|
||||
.withWindowCrop(appWindowCrop)
|
||||
.withAlpha(mNavFadeIn.value);
|
||||
} else {
|
||||
navBuilder.setAlpha(mNavFadeOut.value);
|
||||
navBuilder.withAlpha(mNavFadeOut.value);
|
||||
}
|
||||
params.add(navBuilder.build());
|
||||
}
|
||||
surfaceApplier.scheduleApply(transaction);
|
||||
|
||||
surfaceApplier.scheduleApply(params.toArray(new SurfaceParams[params.size()]));
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1226,15 +1231,16 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
unlockAnimator.addListener(new AnimatorListenerAdapter() {
|
||||
@Override
|
||||
public void onAnimationStart(Animator animation) {
|
||||
SurfaceTransaction transaction = new SurfaceTransaction();
|
||||
SurfaceParams[] params = new SurfaceParams[appTargets.length];
|
||||
for (int i = appTargets.length - 1; i >= 0; i--) {
|
||||
RemoteAnimationTargetCompat target = appTargets[i];
|
||||
transaction.forSurface(target.leash)
|
||||
.setAlpha(1f)
|
||||
.setWindowCrop(target.screenSpaceBounds)
|
||||
.setCornerRadius(cornerRadius);
|
||||
params[i] = new SurfaceParams.Builder(target.leash)
|
||||
.withAlpha(1f)
|
||||
.withWindowCrop(target.screenSpaceBounds)
|
||||
.withCornerRadius(cornerRadius)
|
||||
.build();
|
||||
}
|
||||
surfaceApplier.scheduleApply(transaction);
|
||||
surfaceApplier.scheduleApply(params);
|
||||
}
|
||||
});
|
||||
return unlockAnimator;
|
||||
@@ -1452,10 +1458,10 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
|
||||
@Override
|
||||
public void onUpdate(float percent, boolean initOnly) {
|
||||
SurfaceTransaction transaction = new SurfaceTransaction();
|
||||
SurfaceParams[] params = new SurfaceParams[appTargets.length];
|
||||
for (int i = appTargets.length - 1; i >= 0; i--) {
|
||||
RemoteAnimationTargetCompat target = appTargets[i];
|
||||
SurfaceProperties builder = transaction.forSurface(target.leash);
|
||||
SurfaceParams.Builder builder = new SurfaceParams.Builder(target.leash);
|
||||
|
||||
if (target.localBounds != null) {
|
||||
tmpPos.set(target.localBounds.left, target.localBounds.top);
|
||||
@@ -1477,19 +1483,20 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
tmpRect.centerY());
|
||||
matrix.postTranslate(0, mDy.value);
|
||||
matrix.postTranslate(tmpPos.x, tmpPos.y);
|
||||
builder.setMatrix(matrix)
|
||||
.setWindowCrop(crop)
|
||||
.setAlpha(mAlpha.value)
|
||||
.setCornerRadius(windowCornerRadius)
|
||||
.setShadowRadius(mShadowRadius.value);
|
||||
builder.withMatrix(matrix)
|
||||
.withWindowCrop(crop)
|
||||
.withAlpha(mAlpha.value)
|
||||
.withCornerRadius(windowCornerRadius)
|
||||
.withShadowRadius(mShadowRadius.value);
|
||||
} else if (target.mode == MODE_OPENING) {
|
||||
matrix.setTranslate(tmpPos.x, tmpPos.y);
|
||||
builder.setMatrix(matrix)
|
||||
.setWindowCrop(crop)
|
||||
.setAlpha(1f);
|
||||
builder.withMatrix(matrix)
|
||||
.withWindowCrop(crop)
|
||||
.withAlpha(1f);
|
||||
}
|
||||
params[i] = builder.build();
|
||||
}
|
||||
surfaceApplier.scheduleApply(transaction);
|
||||
surfaceApplier.scheduleApply(params);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1859,10 +1866,10 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
|
||||
@Override
|
||||
public void onUpdate(RectF currentRectF, float progress) {
|
||||
SurfaceTransaction transaction = new SurfaceTransaction();
|
||||
SurfaceParams[] params = new SurfaceParams[mAppTargets.length];
|
||||
for (int i = mAppTargets.length - 1; i >= 0; i--) {
|
||||
RemoteAnimationTargetCompat target = mAppTargets[i];
|
||||
SurfaceProperties builder = transaction.forSurface(target.leash);
|
||||
SurfaceParams.Builder builder = new SurfaceParams.Builder(target.leash);
|
||||
|
||||
if (target.localBounds != null) {
|
||||
mTmpPos.set(target.localBounds.left, target.localBounds.top);
|
||||
@@ -1897,17 +1904,18 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
|
||||
mMatrix.setScale(scale, scale);
|
||||
mMatrix.postTranslate(mCurrentRect.left, mCurrentRect.top);
|
||||
|
||||
builder.setMatrix(mMatrix)
|
||||
.setWindowCrop(mTmpRect)
|
||||
.setAlpha(getWindowAlpha(progress))
|
||||
.setCornerRadius(getCornerRadius(progress) / scale);
|
||||
builder.withMatrix(mMatrix)
|
||||
.withWindowCrop(mTmpRect)
|
||||
.withAlpha(getWindowAlpha(progress))
|
||||
.withCornerRadius(getCornerRadius(progress) / scale);
|
||||
} else if (target.mode == MODE_OPENING) {
|
||||
mMatrix.setTranslate(mTmpPos.x, mTmpPos.y);
|
||||
builder.setMatrix(mMatrix)
|
||||
.setAlpha(1f);
|
||||
builder.withMatrix(mMatrix)
|
||||
.withAlpha(1f);
|
||||
}
|
||||
params[i] = builder.build();
|
||||
}
|
||||
mSurfaceApplier.scheduleApply(transaction);
|
||||
mSurfaceApplier.scheduleApply(params);
|
||||
}
|
||||
|
||||
protected float getWindowAlpha(float progress) {
|
||||
|
||||
@@ -121,7 +121,6 @@ import com.android.launcher3.util.RunnableList;
|
||||
import com.android.launcher3.util.SafeCloseable;
|
||||
import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption;
|
||||
import com.android.launcher3.util.TouchController;
|
||||
import com.android.launcher3.util.ViewCapture;
|
||||
import com.android.launcher3.widget.LauncherAppWidgetHost;
|
||||
import com.android.quickstep.OverviewCommandHelper;
|
||||
import com.android.quickstep.RecentsModel;
|
||||
@@ -135,6 +134,7 @@ import com.android.quickstep.util.RemoteAnimationProvider;
|
||||
import com.android.quickstep.util.RemoteFadeOutAnimationListener;
|
||||
import com.android.quickstep.util.SplitSelectStateController;
|
||||
import com.android.quickstep.util.TISBindHelper;
|
||||
import com.android.quickstep.util.ViewCapture;
|
||||
import com.android.quickstep.views.OverviewActionsView;
|
||||
import com.android.quickstep.views.RecentsView;
|
||||
import com.android.quickstep.views.TaskView;
|
||||
@@ -586,6 +586,8 @@ public class QuickstepLauncher extends Launcher {
|
||||
public void onWidgetsTransition(float progress) {
|
||||
super.onWidgetsTransition(progress);
|
||||
onTaskbarInAppDisplayProgressUpdate(progress, WIDGETS_PAGE_PROGRESS_INDEX);
|
||||
// Change of wallpaper depth in widget picker is disabled for tests as it causes flakiness
|
||||
// on very slow cuttlefish devices.
|
||||
if (ENABLE_WIDGET_PICKER_DEPTH.get() && !Utilities.IS_RUNNING_IN_TEST_HARNESS) {
|
||||
WIDGET_DEPTH.set(getDepthController(),
|
||||
Utilities.mapToRange(progress, 0f, 1f, 0f, getDeviceProfile().bottomSheetDepth,
|
||||
|
||||
@@ -1444,6 +1444,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
||||
}
|
||||
}
|
||||
|
||||
@Nullable
|
||||
private SwipePipToHomeAnimator createWindowAnimationToPip(HomeAnimationFactory homeAnimFactory,
|
||||
RemoteAnimationTargetCompat runningTaskTarget, float startProgress) {
|
||||
// Directly animate the app to PiP (picture-in-picture) mode
|
||||
@@ -1469,6 +1470,10 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
||||
runningTaskTarget.taskInfo.pictureInPictureParams,
|
||||
homeRotation,
|
||||
hotseatKeepClearArea);
|
||||
if (destinationBounds == null) {
|
||||
// No destination bounds returned from SystemUI, bail early.
|
||||
return null;
|
||||
}
|
||||
final Rect appBounds = new Rect();
|
||||
final WindowConfiguration winConfig = taskInfo.configuration.windowConfiguration;
|
||||
// Adjust the appBounds for TaskBar by using the calculated window crop Rect
|
||||
|
||||
@@ -65,12 +65,12 @@ import com.android.launcher3.util.DisplayController;
|
||||
import com.android.quickstep.fallback.FallbackRecentsView;
|
||||
import com.android.quickstep.fallback.RecentsState;
|
||||
import com.android.quickstep.util.RectFSpringAnim;
|
||||
import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties;
|
||||
import com.android.quickstep.util.TransformParams;
|
||||
import com.android.quickstep.util.TransformParams.BuilderProxy;
|
||||
import com.android.systemui.shared.recents.model.Task.TaskKey;
|
||||
import com.android.systemui.shared.system.InputConsumerController;
|
||||
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
|
||||
|
||||
import java.lang.ref.WeakReference;
|
||||
import java.util.ArrayList;
|
||||
@@ -125,18 +125,18 @@ public class FallbackSwipeHandler extends
|
||||
}
|
||||
}
|
||||
|
||||
private void updateHomeActivityTransformDuringSwipeUp(SurfaceProperties builder,
|
||||
private void updateHomeActivityTransformDuringSwipeUp(SurfaceParams.Builder builder,
|
||||
RemoteAnimationTargetCompat app, TransformParams params) {
|
||||
setHomeScaleAndAlpha(builder, app, mCurrentShift.value,
|
||||
Utilities.boundToRange(1 - mCurrentShift.value, 0, 1));
|
||||
}
|
||||
|
||||
private void setHomeScaleAndAlpha(SurfaceProperties builder,
|
||||
private void setHomeScaleAndAlpha(SurfaceParams.Builder builder,
|
||||
RemoteAnimationTargetCompat app, float verticalShift, float alpha) {
|
||||
float scale = Utilities.mapRange(verticalShift, 1, mMaxLauncherScale);
|
||||
mTmpMatrix.setScale(scale, scale,
|
||||
app.localBounds.exactCenterX(), app.localBounds.exactCenterY());
|
||||
builder.setMatrix(mTmpMatrix).setAlpha(alpha);
|
||||
builder.withMatrix(mTmpMatrix).withAlpha(alpha);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -279,12 +279,12 @@ public class FallbackSwipeHandler extends
|
||||
return mTargetRect;
|
||||
}
|
||||
|
||||
private void updateRecentsActivityTransformDuringHomeAnim(SurfaceProperties builder,
|
||||
private void updateRecentsActivityTransformDuringHomeAnim(SurfaceParams.Builder builder,
|
||||
RemoteAnimationTargetCompat app, TransformParams params) {
|
||||
builder.setAlpha(mRecentsAlpha.value);
|
||||
builder.withAlpha(mRecentsAlpha.value);
|
||||
}
|
||||
|
||||
private void updateHomeActivityTransformDuringHomeAnim(SurfaceProperties builder,
|
||||
private void updateHomeActivityTransformDuringHomeAnim(SurfaceParams.Builder builder,
|
||||
RemoteAnimationTargetCompat app, TransformParams params) {
|
||||
setHomeScaleAndAlpha(builder, app, mVerticalShiftForScale.value, mHomeAlpha.value);
|
||||
}
|
||||
|
||||
@@ -46,6 +46,7 @@ import com.android.launcher3.uioverrides.QuickstepLauncher;
|
||||
import com.android.quickstep.util.RectFSpringAnim;
|
||||
import com.android.systemui.shared.system.QuickStepContract;
|
||||
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
|
||||
|
||||
/**
|
||||
* Controls the animation of swiping back and returning to launcher.
|
||||
@@ -241,17 +242,20 @@ public class LauncherBackAnimationController {
|
||||
|
||||
/** Transform the target window to match the target rect. */
|
||||
private void applyTransform(RectF targetRect, float cornerRadius) {
|
||||
SyncRtSurfaceTransactionApplierCompat.SurfaceParams.Builder builder =
|
||||
new SyncRtSurfaceTransactionApplierCompat.SurfaceParams.Builder(mBackTarget.leash);
|
||||
final float scale = targetRect.width() / mStartRect.width();
|
||||
mTransformMatrix.reset();
|
||||
mTransformMatrix.setScale(scale, scale);
|
||||
mTransformMatrix.postTranslate(targetRect.left, targetRect.top);
|
||||
builder.withMatrix(mTransformMatrix)
|
||||
.withWindowCrop(mStartRect)
|
||||
.withCornerRadius(cornerRadius);
|
||||
SyncRtSurfaceTransactionApplierCompat.SurfaceParams surfaceParams = builder.build();
|
||||
|
||||
if (mBackTarget.leash.isValid()) {
|
||||
mTransaction.setMatrix(mBackTarget.leash, mTransformMatrix, new float[9]);
|
||||
mTransaction.setWindowCrop(mBackTarget.leash, mStartRect);
|
||||
mTransaction.setCornerRadius(mBackTarget.leash, cornerRadius);
|
||||
if (surfaceParams.surface.isValid()) {
|
||||
surfaceParams.applyTo(mTransaction);
|
||||
}
|
||||
|
||||
mTransaction.apply();
|
||||
}
|
||||
|
||||
|
||||
@@ -37,11 +37,11 @@ import com.android.launcher3.touch.PagedOrientationHandler;
|
||||
import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle;
|
||||
import com.android.quickstep.util.AnimatorControllerWithResistance;
|
||||
import com.android.quickstep.util.RectFSpringAnim;
|
||||
import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties;
|
||||
import com.android.quickstep.util.TaskViewSimulator;
|
||||
import com.android.quickstep.util.TransformParams;
|
||||
import com.android.quickstep.util.TransformParams.BuilderProxy;
|
||||
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams.Builder;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.function.Consumer;
|
||||
@@ -335,11 +335,11 @@ public abstract class SwipeUpAnimationLogic implements
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBuildTargetParams(SurfaceProperties builder, RemoteAnimationTargetCompat app,
|
||||
TransformParams params) {
|
||||
builder.setMatrix(mMatrix)
|
||||
.setWindowCrop(mCropRect)
|
||||
.setCornerRadius(params.getCornerRadius());
|
||||
public void onBuildTargetParams(
|
||||
Builder builder, RemoteAnimationTargetCompat app, TransformParams params) {
|
||||
builder.withMatrix(mMatrix)
|
||||
.withWindowCrop(mCropRect)
|
||||
.withCornerRadius(params.getCornerRadius());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -45,6 +45,7 @@ import android.view.RemoteAnimationTarget;
|
||||
import android.view.SurfaceControl;
|
||||
import android.window.IOnBackInvokedCallback;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.WorkerThread;
|
||||
|
||||
import com.android.internal.logging.InstanceId;
|
||||
@@ -483,6 +484,10 @@ public class SystemUiProxy implements ISystemUiProxy {
|
||||
mPipAnimationListener = listener;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Destination bounds of auto-pip animation, {@code null} if the animation is not ready.
|
||||
*/
|
||||
@Nullable
|
||||
public Rect startSwipePipToHome(ComponentName componentName, ActivityInfo activityInfo,
|
||||
PictureInPictureParams pictureInPictureParams, int launcherRotation,
|
||||
Rect hotseatKeepClearArea) {
|
||||
|
||||
@@ -72,8 +72,6 @@ import com.android.launcher3.statemanager.StateManager;
|
||||
import com.android.launcher3.util.DisplayController;
|
||||
import com.android.quickstep.RemoteTargetGluer.RemoteTargetHandle;
|
||||
import com.android.quickstep.util.MultiValueUpdateListener;
|
||||
import com.android.quickstep.util.SurfaceTransaction;
|
||||
import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties;
|
||||
import com.android.quickstep.util.SurfaceTransactionApplier;
|
||||
import com.android.quickstep.util.TaskViewSimulator;
|
||||
import com.android.quickstep.util.TransformParams;
|
||||
@@ -84,6 +82,7 @@ import com.android.quickstep.views.TaskView;
|
||||
import com.android.systemui.shared.recents.model.Task;
|
||||
import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
|
||||
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -253,24 +252,21 @@ public final class TaskViewUtils {
|
||||
|
||||
@Override
|
||||
public void onUpdate(float percent, boolean initOnly) {
|
||||
|
||||
final SurfaceParams.Builder navBuilder =
|
||||
new SurfaceParams.Builder(navBarTarget.leash);
|
||||
|
||||
// TODO Do we need to operate over multiple TVSs for the navbar leash?
|
||||
for (RemoteTargetHandle handle : remoteTargetHandles) {
|
||||
SurfaceTransaction transaction = new SurfaceTransaction();
|
||||
SurfaceProperties navBuilder =
|
||||
transaction.forSurface(navBarTarget.leash);
|
||||
|
||||
if (mNavFadeIn.value > mNavFadeIn.getStartValue()) {
|
||||
TaskViewSimulator taskViewSimulator = handle.getTaskViewSimulator();
|
||||
taskViewSimulator.getCurrentCropRect().round(cropRect);
|
||||
navBuilder.setMatrix(taskViewSimulator.getCurrentMatrix())
|
||||
.setWindowCrop(cropRect)
|
||||
.setAlpha(mNavFadeIn.value);
|
||||
navBuilder.withMatrix(taskViewSimulator.getCurrentMatrix())
|
||||
.withWindowCrop(cropRect)
|
||||
.withAlpha(mNavFadeIn.value);
|
||||
} else {
|
||||
navBuilder.setAlpha(mNavFadeOut.value);
|
||||
navBuilder.withAlpha(mNavFadeOut.value);
|
||||
}
|
||||
handle.getTransformParams().applySurfaceParams(transaction);
|
||||
handle.getTransformParams().applySurfaceParams(navBuilder.build());
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -478,7 +474,7 @@ public final class TaskViewUtils {
|
||||
* If {@param launchingTaskView} is not null, then this will play the tasks launch animation
|
||||
* from the position of the GroupedTaskView (when user taps on the TaskView to start it).
|
||||
* Technically this case should be taken care of by
|
||||
* {@link #composeRecentsSplitLaunchAnimatorLegacy} below, but the way we launch tasks whether
|
||||
* {@link #composeRecentsSplitLaunchAnimatorLegacy()} below, but the way we launch tasks whether
|
||||
* it's a single task or multiple tasks results in different entry-points.
|
||||
*
|
||||
* If it is null, then it will simply fade in the starting apps and fade out launcher (for the
|
||||
|
||||
@@ -82,7 +82,6 @@ import com.android.launcher3.uioverrides.plugins.PluginManagerWrapper;
|
||||
import com.android.launcher3.util.DisplayController;
|
||||
import com.android.launcher3.util.OnboardingPrefs;
|
||||
import com.android.launcher3.util.TraceHelper;
|
||||
import com.android.launcher3.util.ViewCapture;
|
||||
import com.android.launcher3.util.WindowBounds;
|
||||
import com.android.quickstep.inputconsumers.AccessibilityInputConsumer;
|
||||
import com.android.quickstep.inputconsumers.AssistantInputConsumer;
|
||||
@@ -101,6 +100,7 @@ import com.android.quickstep.util.ActiveGestureLog.CompoundString;
|
||||
import com.android.quickstep.util.ProtoTracer;
|
||||
import com.android.quickstep.util.ProxyScreenStatusProvider;
|
||||
import com.android.quickstep.util.SplitScreenBounds;
|
||||
import com.android.quickstep.util.ViewCapture;
|
||||
import com.android.systemui.shared.recents.IOverviewProxy;
|
||||
import com.android.systemui.shared.recents.ISystemUiProxy;
|
||||
import com.android.systemui.shared.system.ActivityManagerWrapper;
|
||||
|
||||
@@ -53,13 +53,13 @@ import com.android.quickstep.RecentsAnimationController;
|
||||
import com.android.quickstep.RecentsAnimationDeviceState;
|
||||
import com.android.quickstep.RecentsAnimationTargets;
|
||||
import com.android.quickstep.TaskAnimationManager;
|
||||
import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties;
|
||||
import com.android.quickstep.util.TransformParams;
|
||||
import com.android.quickstep.util.TransformParams.BuilderProxy;
|
||||
import com.android.systemui.shared.recents.model.ThumbnailData;
|
||||
import com.android.systemui.shared.system.ActivityManagerWrapper;
|
||||
import com.android.systemui.shared.system.InputMonitorCompat;
|
||||
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams.Builder;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
@@ -290,9 +290,9 @@ public class DeviceLockedInputConsumer implements InputConsumer,
|
||||
|
||||
@Override
|
||||
public void onBuildTargetParams(
|
||||
SurfaceProperties builder, RemoteAnimationTargetCompat app, TransformParams params) {
|
||||
Builder builder, RemoteAnimationTargetCompat app, TransformParams params) {
|
||||
mMatrix.setTranslate(0, mProgress.value * mMaxTranslationY);
|
||||
builder.setMatrix(mMatrix);
|
||||
builder.withMatrix(mMatrix);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+14
-17
@@ -33,6 +33,7 @@ import android.graphics.PointF;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.RectF;
|
||||
import android.os.Build;
|
||||
import android.view.SurfaceControl;
|
||||
import android.view.View;
|
||||
import android.view.ViewOutlineProvider;
|
||||
|
||||
@@ -52,11 +53,9 @@ import com.android.quickstep.RecentsAnimationDeviceState;
|
||||
import com.android.quickstep.RemoteTargetGluer;
|
||||
import com.android.quickstep.SwipeUpAnimationLogic;
|
||||
import com.android.quickstep.SwipeUpAnimationLogic.RunningWindowAnim;
|
||||
import com.android.quickstep.util.RecordingSurfaceTransaction;
|
||||
import com.android.quickstep.util.RecordingSurfaceTransaction.MockProperties;
|
||||
import com.android.quickstep.util.RectFSpringAnim;
|
||||
import com.android.quickstep.util.SurfaceTransaction;
|
||||
import com.android.quickstep.util.TransformParams;
|
||||
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.R)
|
||||
abstract class SwipeUpGestureTutorialController extends TutorialController {
|
||||
@@ -416,23 +415,21 @@ abstract class SwipeUpGestureTutorialController extends TutorialController {
|
||||
private class FakeTransformParams extends TransformParams {
|
||||
|
||||
@Override
|
||||
public SurfaceTransaction createSurfaceParams(BuilderProxy proxy) {
|
||||
RecordingSurfaceTransaction transaction = new RecordingSurfaceTransaction();
|
||||
proxy.onBuildTargetParams(transaction.mockProperties, null, this);
|
||||
return transaction;
|
||||
public SurfaceParams[] createSurfaceParams(BuilderProxy proxy) {
|
||||
SurfaceParams.Builder builder = new SurfaceParams.Builder((SurfaceControl) null);
|
||||
proxy.onBuildTargetParams(builder, null, this);
|
||||
return new SurfaceParams[] {builder.build()};
|
||||
}
|
||||
|
||||
@Override
|
||||
public void applySurfaceParams(SurfaceTransaction params) {
|
||||
if (params instanceof RecordingSurfaceTransaction) {
|
||||
MockProperties p = ((RecordingSurfaceTransaction) params).mockProperties;
|
||||
mFakeTaskView.setAnimationMatrix(p.matrix);
|
||||
mFakePreviousTaskView.setAnimationMatrix(p.matrix);
|
||||
mFakeTaskViewRect.set(p.windowCrop);
|
||||
mFakeTaskViewRadius = p.cornerRadius;
|
||||
mFakeTaskView.invalidateOutline();
|
||||
mFakePreviousTaskView.invalidateOutline();
|
||||
}
|
||||
public void applySurfaceParams(SurfaceParams[] params) {
|
||||
SurfaceParams p = params[0];
|
||||
mFakeTaskView.setAnimationMatrix(p.matrix);
|
||||
mFakePreviousTaskView.setAnimationMatrix(p.matrix);
|
||||
mFakeTaskViewRect.set(p.windowCrop);
|
||||
mFakeTaskViewRadius = p.cornerRadius;
|
||||
mFakeTaskView.invalidateOutline();
|
||||
mFakePreviousTaskView.invalidateOutline();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,81 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2022 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 android.graphics.Matrix;
|
||||
import android.graphics.Rect;
|
||||
|
||||
/**
|
||||
* Extension for {@link SurfaceTransaction} which records the commands for mocking
|
||||
*/
|
||||
public class RecordingSurfaceTransaction extends SurfaceTransaction {
|
||||
|
||||
/**
|
||||
* A mock builder which can be used for recording values
|
||||
*/
|
||||
public final MockProperties mockProperties = new MockProperties();
|
||||
|
||||
/**
|
||||
* Extension of {@link SurfaceProperties} which just stores all the values locally
|
||||
*/
|
||||
public class MockProperties extends SurfaceProperties {
|
||||
|
||||
public float alpha = -1;
|
||||
public Matrix matrix = null;
|
||||
public Rect windowCrop = null;
|
||||
public float cornerRadius = 0;
|
||||
public float shadowRadius = 0;
|
||||
|
||||
MockProperties() {
|
||||
super(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SurfaceProperties setAlpha(float alpha) {
|
||||
this.alpha = alpha;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SurfaceProperties setMatrix(Matrix matrix) {
|
||||
this.matrix = matrix;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SurfaceProperties setWindowCrop(Rect windowCrop) {
|
||||
this.windowCrop = windowCrop;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SurfaceProperties setLayer(int relativeLayer) {
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SurfaceProperties setCornerRadius(float radius) {
|
||||
this.cornerRadius = radius;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SurfaceProperties setShadowRadius(float radius) {
|
||||
this.shadowRadius = radius;
|
||||
return this;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -19,10 +19,10 @@ import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MOD
|
||||
|
||||
import android.animation.ValueAnimator;
|
||||
import android.animation.ValueAnimator.AnimatorUpdateListener;
|
||||
import android.view.SurfaceControl.Transaction;
|
||||
|
||||
import com.android.quickstep.RemoteAnimationTargets;
|
||||
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
import com.android.systemui.shared.system.TransactionCompat;
|
||||
|
||||
/**
|
||||
* Animation listener which fades out the closing targets
|
||||
@@ -40,7 +40,7 @@ public class RemoteFadeOutAnimationListener implements AnimatorUpdateListener {
|
||||
|
||||
@Override
|
||||
public void onAnimationUpdate(ValueAnimator valueAnimator) {
|
||||
Transaction t = new Transaction();
|
||||
TransactionCompat t = new TransactionCompat();
|
||||
if (mFirstFrame) {
|
||||
for (RemoteAnimationTargetCompat target : mTarget.unfilteredApps) {
|
||||
t.show(target.leash);
|
||||
|
||||
@@ -1,110 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2022 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 android.graphics.Matrix;
|
||||
import android.graphics.Rect;
|
||||
import android.view.SurfaceControl;
|
||||
import android.view.SurfaceControl.Transaction;
|
||||
|
||||
/**
|
||||
* Helper class for building a {@link Transaction}.
|
||||
*/
|
||||
public class SurfaceTransaction {
|
||||
|
||||
private final Transaction mTransaction = new Transaction();
|
||||
private final float[] mTmpValues = new float[9];
|
||||
|
||||
/**
|
||||
* Creates a new builder for the provided surface
|
||||
*/
|
||||
public SurfaceProperties forSurface(SurfaceControl surface) {
|
||||
return new SurfaceProperties(surface);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the final transaction
|
||||
*/
|
||||
public Transaction getTransaction() {
|
||||
return mTransaction;
|
||||
}
|
||||
|
||||
/**
|
||||
* Utility class to update surface params in a transaction
|
||||
*/
|
||||
public class SurfaceProperties {
|
||||
|
||||
private final SurfaceControl mSurface;
|
||||
|
||||
SurfaceProperties(SurfaceControl surface) {
|
||||
mSurface = surface;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param alpha The alpha value to apply to the surface.
|
||||
* @return this Builder
|
||||
*/
|
||||
public SurfaceProperties setAlpha(float alpha) {
|
||||
mTransaction.setAlpha(mSurface, alpha);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param matrix The matrix to apply to the surface.
|
||||
* @return this Builder
|
||||
*/
|
||||
public SurfaceProperties setMatrix(Matrix matrix) {
|
||||
mTransaction.setMatrix(mSurface, matrix, mTmpValues);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param windowCrop The window crop to apply to the surface.
|
||||
* @return this Builder
|
||||
*/
|
||||
public SurfaceProperties setWindowCrop(Rect windowCrop) {
|
||||
mTransaction.setWindowCrop(mSurface, windowCrop);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param relativeLayer The relative layer.
|
||||
* @return this Builder
|
||||
*/
|
||||
public SurfaceProperties setLayer(int relativeLayer) {
|
||||
mTransaction.setLayer(mSurface, relativeLayer);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param radius the Radius for rounded corners to apply to the surface.
|
||||
* @return this Builder
|
||||
*/
|
||||
public SurfaceProperties setCornerRadius(float radius) {
|
||||
mTransaction.setCornerRadius(mSurface, radius);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param radius the Radius for the shadows to apply to the surface.
|
||||
* @return this Builder
|
||||
*/
|
||||
public SurfaceProperties setShadowRadius(float radius) {
|
||||
mTransaction.setShadowRadius(mSurface, radius);
|
||||
return this;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25,6 +25,7 @@ import android.view.View;
|
||||
import android.view.ViewRootImpl;
|
||||
|
||||
import com.android.quickstep.RemoteAnimationTargets.ReleaseCheck;
|
||||
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
|
||||
@@ -69,12 +70,18 @@ public class SurfaceTransactionApplier extends ReleaseCheck {
|
||||
* @param params The surface parameters to apply. DO NOT MODIFY the list after passing into
|
||||
* this method to avoid synchronization issues.
|
||||
*/
|
||||
public void scheduleApply(SurfaceTransaction params) {
|
||||
public void scheduleApply(final SurfaceParams... params) {
|
||||
View view = mTargetViewRootImpl.getView();
|
||||
if (view == null) {
|
||||
return;
|
||||
}
|
||||
Transaction t = params.getTransaction();
|
||||
Transaction t = new Transaction();
|
||||
for (int i = params.length - 1; i >= 0; i--) {
|
||||
SurfaceParams surfaceParams = params[i];
|
||||
if (surfaceParams.surface.isValid()) {
|
||||
surfaceParams.applyTo(t);
|
||||
}
|
||||
}
|
||||
|
||||
mLastSequenceNumber++;
|
||||
final int toApplySeqNo = mLastSequenceNumber;
|
||||
@@ -95,7 +102,7 @@ public class SurfaceTransactionApplier extends ReleaseCheck {
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates an instance of SurfaceTransactionApplier, deferring until the target view is
|
||||
* Creates an instance of SyncRtSurfaceTransactionApplier, deferring until the target view is
|
||||
* attached if necessary.
|
||||
*/
|
||||
public static void create(
|
||||
|
||||
@@ -47,11 +47,11 @@ import com.android.launcher3.util.TraceHelper;
|
||||
import com.android.quickstep.AnimatedFloat;
|
||||
import com.android.quickstep.BaseActivityInterface;
|
||||
import com.android.quickstep.TaskAnimationManager;
|
||||
import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties;
|
||||
import com.android.quickstep.views.TaskThumbnailView.PreviewPositionHelper;
|
||||
import com.android.quickstep.views.TaskView.FullscreenDrawParams;
|
||||
import com.android.systemui.shared.recents.model.ThumbnailData;
|
||||
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams.Builder;
|
||||
|
||||
/**
|
||||
* A utility class which emulates the layout behavior of TaskView and RecentsView
|
||||
@@ -387,10 +387,10 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
|
||||
|
||||
@Override
|
||||
public void onBuildTargetParams(
|
||||
SurfaceProperties builder, RemoteAnimationTargetCompat app, TransformParams params) {
|
||||
builder.setMatrix(mMatrix)
|
||||
.setWindowCrop(mTmpCropRect)
|
||||
.setCornerRadius(getCurrentCornerRadius());
|
||||
Builder builder, RemoteAnimationTargetCompat app, TransformParams params) {
|
||||
builder.withMatrix(mMatrix)
|
||||
.withWindowCrop(mTmpCropRect)
|
||||
.withCornerRadius(getCurrentCornerRadius());
|
||||
|
||||
// If mDrawsBelowRecents is unset, no reordering will be enforced.
|
||||
if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mDrawsBelowRecents != null) {
|
||||
@@ -399,7 +399,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
|
||||
// conflict with layers that WM core positions (ie. the input consumers). For shell
|
||||
// transitions, the animation leashes are reparented to an animation container so we
|
||||
// can bump layers as needed.
|
||||
builder.setLayer(mDrawsBelowRecents
|
||||
builder.withLayer(mDrawsBelowRecents
|
||||
? Integer.MIN_VALUE + 1
|
||||
: ENABLE_SHELL_TRANSITIONS ? Integer.MAX_VALUE : 0);
|
||||
}
|
||||
|
||||
@@ -21,8 +21,10 @@ import android.view.SurfaceControl;
|
||||
import com.android.launcher3.Utilities;
|
||||
import com.android.launcher3.anim.Interpolators;
|
||||
import com.android.quickstep.RemoteAnimationTargets;
|
||||
import com.android.quickstep.util.SurfaceTransaction.SurfaceProperties;
|
||||
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
|
||||
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
|
||||
import com.android.systemui.shared.system.TransactionCompat;
|
||||
|
||||
public class TransformParams {
|
||||
|
||||
@@ -111,7 +113,8 @@ public class TransformParams {
|
||||
* Sets the SyncRtSurfaceTransactionApplierCompat that will apply the SurfaceParams that
|
||||
* are computed based on these TransformParams.
|
||||
*/
|
||||
public TransformParams setSyncTransactionApplier(SurfaceTransactionApplier applier) {
|
||||
public TransformParams setSyncTransactionApplier(
|
||||
SurfaceTransactionApplier applier) {
|
||||
mSyncTransactionApplier = applier;
|
||||
return this;
|
||||
}
|
||||
@@ -134,14 +137,16 @@ public class TransformParams {
|
||||
return this;
|
||||
}
|
||||
|
||||
public SurfaceTransaction createSurfaceParams(BuilderProxy proxy) {
|
||||
public SurfaceParams[] createSurfaceParams(BuilderProxy proxy) {
|
||||
RemoteAnimationTargets targets = mTargetSet;
|
||||
SurfaceTransaction transaction = new SurfaceTransaction();
|
||||
final int appLength = targets.unfilteredApps.length;
|
||||
final int wallpaperLength = targets.wallpapers != null ? targets.wallpapers.length : 0;
|
||||
SurfaceParams[] surfaceParams = new SurfaceParams[appLength + wallpaperLength];
|
||||
mRecentsSurface = getRecentsSurface(targets);
|
||||
|
||||
for (int i = 0; i < targets.unfilteredApps.length; i++) {
|
||||
for (int i = 0; i < appLength; i++) {
|
||||
RemoteAnimationTargetCompat app = targets.unfilteredApps[i];
|
||||
SurfaceProperties builder = transaction.forSurface(app.leash);
|
||||
SurfaceParams.Builder builder = new SurfaceParams.Builder(app.leash);
|
||||
|
||||
if (app.mode == targets.targetMode) {
|
||||
if (app.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME) {
|
||||
@@ -151,9 +156,9 @@ public class TransformParams {
|
||||
if (app.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_ASSISTANT
|
||||
&& app.isNotInRecents) {
|
||||
float progress = Utilities.boundToRange(getProgress(), 0, 1);
|
||||
builder.setAlpha(1 - Interpolators.DEACCEL_2_5.getInterpolation(progress));
|
||||
builder.withAlpha(1 - Interpolators.DEACCEL_2_5.getInterpolation(progress));
|
||||
} else {
|
||||
builder.setAlpha(getTargetAlpha());
|
||||
builder.withAlpha(getTargetAlpha());
|
||||
}
|
||||
|
||||
proxy.onBuildTargetParams(builder, app, this);
|
||||
@@ -161,15 +166,15 @@ public class TransformParams {
|
||||
} else {
|
||||
mBaseBuilderProxy.onBuildTargetParams(builder, app, this);
|
||||
}
|
||||
surfaceParams[i] = builder.build();
|
||||
}
|
||||
|
||||
// always put wallpaper layer to bottom.
|
||||
final int wallpaperLength = targets.wallpapers != null ? targets.wallpapers.length : 0;
|
||||
for (int i = 0; i < wallpaperLength; i++) {
|
||||
RemoteAnimationTargetCompat wallpaper = targets.wallpapers[i];
|
||||
transaction.forSurface(wallpaper.leash).setLayer(Integer.MIN_VALUE);
|
||||
surfaceParams[appLength + i] = new SurfaceParams.Builder(wallpaper.leash)
|
||||
.withLayer(Integer.MIN_VALUE).build();
|
||||
}
|
||||
return transaction;
|
||||
return surfaceParams;
|
||||
}
|
||||
|
||||
private static SurfaceControl getRecentsSurface(RemoteAnimationTargets targets) {
|
||||
@@ -208,11 +213,15 @@ public class TransformParams {
|
||||
return mTargetSet;
|
||||
}
|
||||
|
||||
public void applySurfaceParams(SurfaceTransaction builder) {
|
||||
public void applySurfaceParams(SurfaceParams... params) {
|
||||
if (mSyncTransactionApplier != null) {
|
||||
mSyncTransactionApplier.scheduleApply(builder);
|
||||
mSyncTransactionApplier.scheduleApply(params);
|
||||
} else {
|
||||
builder.getTransaction().apply();
|
||||
TransactionCompat t = new TransactionCompat();
|
||||
for (SurfaceParams param : params) {
|
||||
SyncRtSurfaceTransactionApplierCompat.applyParams(t, param);
|
||||
}
|
||||
t.apply();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -220,9 +229,9 @@ public class TransformParams {
|
||||
public interface BuilderProxy {
|
||||
|
||||
BuilderProxy NO_OP = (builder, app, params) -> { };
|
||||
BuilderProxy ALWAYS_VISIBLE = (builder, app, params) -> builder.setAlpha(1);
|
||||
BuilderProxy ALWAYS_VISIBLE = (builder, app, params) ->builder.withAlpha(1);
|
||||
|
||||
void onBuildTargetParams(SurfaceProperties builder,
|
||||
void onBuildTargetParams(SurfaceParams.Builder builder,
|
||||
RemoteAnimationTargetCompat app, TransformParams params);
|
||||
}
|
||||
}
|
||||
+4
-1
@@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package com.android.launcher3.util;
|
||||
package com.android.quickstep.util;
|
||||
|
||||
import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
|
||||
import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
|
||||
@@ -44,6 +44,9 @@ import androidx.annotation.UiThread;
|
||||
import androidx.annotation.WorkerThread;
|
||||
|
||||
import com.android.launcher3.config.FeatureFlags;
|
||||
import com.android.launcher3.util.LooperExecutor;
|
||||
import com.android.launcher3.util.MainThreadInitializedObject;
|
||||
import com.android.launcher3.util.SafeCloseable;
|
||||
import com.android.launcher3.view.ViewCaptureData.ExportedData;
|
||||
import com.android.launcher3.view.ViewCaptureData.FrameData;
|
||||
import com.android.launcher3.view.ViewCaptureData.ViewNode;
|
||||
@@ -177,7 +177,6 @@ import com.android.quickstep.util.LayoutUtils;
|
||||
import com.android.quickstep.util.RecentsOrientedState;
|
||||
import com.android.quickstep.util.SplitScreenBounds;
|
||||
import com.android.quickstep.util.SplitSelectStateController;
|
||||
import com.android.quickstep.util.SurfaceTransaction;
|
||||
import com.android.quickstep.util.SurfaceTransactionApplier;
|
||||
import com.android.quickstep.util.TaskViewSimulator;
|
||||
import com.android.quickstep.util.TaskVisualsChangeListener;
|
||||
@@ -190,6 +189,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
|
||||
import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
|
||||
import com.android.systemui.shared.system.PackageManagerWrapper;
|
||||
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
|
||||
import com.android.systemui.shared.system.TaskStackChangeListener;
|
||||
import com.android.systemui.shared.system.TaskStackChangeListeners;
|
||||
import com.android.wm.shell.pip.IPipAnimationListener;
|
||||
@@ -1117,15 +1117,14 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
appAnimator.setInterpolator(ACCEL_DEACCEL);
|
||||
appAnimator.addUpdateListener(valueAnimator -> {
|
||||
float percent = valueAnimator.getAnimatedFraction();
|
||||
SurfaceTransaction transaction = new SurfaceTransaction();
|
||||
SurfaceParams.Builder builder = new SurfaceParams.Builder(
|
||||
apps[apps.length - 1].leash);
|
||||
Matrix matrix = new Matrix();
|
||||
matrix.postScale(percent, percent);
|
||||
matrix.postTranslate(mActivity.getDeviceProfile().widthPx * (1 - percent) / 2,
|
||||
mActivity.getDeviceProfile().heightPx * (1 - percent) / 2);
|
||||
transaction.forSurface(apps[apps.length - 1].leash)
|
||||
.setAlpha(percent)
|
||||
.setMatrix(matrix);
|
||||
surfaceApplier.scheduleApply(transaction);
|
||||
builder.withAlpha(percent).withMatrix(matrix);
|
||||
surfaceApplier.scheduleApply(builder.build());
|
||||
});
|
||||
anim.play(appAnimator);
|
||||
anim.addListener(new AnimatorListenerAdapter() {
|
||||
|
||||
@@ -36,6 +36,7 @@ import android.appwidget.AppWidgetProviderInfo;
|
||||
import android.content.ComponentName;
|
||||
import android.os.UserHandle;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
import androidx.test.filters.SmallTest;
|
||||
@@ -110,6 +111,7 @@ public final class WidgetsPredicationUpdateTaskTest {
|
||||
doReturn(allWidgets).when(manager).getInstalledProvidersForProfile(eq(myUserHandle()));
|
||||
doAnswer(i -> {
|
||||
String pkg = i.getArgument(0);
|
||||
Log.e("Hello", "Getting v " + pkg);
|
||||
return TextUtils.isEmpty(pkg) ? allWidgets : allWidgets.stream()
|
||||
.filter(a -> pkg.equals(a.provider.getPackageName()))
|
||||
.collect(Collectors.toList());
|
||||
|
||||
@@ -24,6 +24,7 @@ import android.graphics.Rect;
|
||||
import android.graphics.RectF;
|
||||
import android.util.ArrayMap;
|
||||
import android.view.Surface;
|
||||
import android.view.SurfaceControl;
|
||||
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
import androidx.test.filters.SmallTest;
|
||||
@@ -41,8 +42,8 @@ import com.android.launcher3.util.window.CachedDisplayInfo;
|
||||
import com.android.launcher3.util.window.WindowManagerProxy;
|
||||
import com.android.quickstep.FallbackActivityInterface;
|
||||
import com.android.quickstep.SystemUiProxy;
|
||||
import com.android.quickstep.util.RecordingSurfaceTransaction.MockProperties;
|
||||
import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
|
||||
import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.SurfaceParams;
|
||||
|
||||
import org.hamcrest.Description;
|
||||
import org.hamcrest.TypeSafeMatcher;
|
||||
@@ -206,21 +207,17 @@ public class TaskViewSimulatorTest {
|
||||
}
|
||||
|
||||
@Override
|
||||
public SurfaceTransaction createSurfaceParams(BuilderProxy proxy) {
|
||||
RecordingSurfaceTransaction transaction = new RecordingSurfaceTransaction();
|
||||
proxy.onBuildTargetParams(
|
||||
transaction.mockProperties, mock(RemoteAnimationTargetCompat.class), this);
|
||||
return transaction;
|
||||
public SurfaceParams[] createSurfaceParams(BuilderProxy proxy) {
|
||||
SurfaceParams.Builder builder = new SurfaceParams.Builder((SurfaceControl) null);
|
||||
proxy.onBuildTargetParams(builder, mock(RemoteAnimationTargetCompat.class), this);
|
||||
return new SurfaceParams[] {builder.build()};
|
||||
}
|
||||
|
||||
@Override
|
||||
public void applySurfaceParams(SurfaceTransaction params) {
|
||||
Assert.assertTrue(params instanceof RecordingSurfaceTransaction);
|
||||
MockProperties p = ((RecordingSurfaceTransaction) params).mockProperties;
|
||||
|
||||
public void applySurfaceParams(SurfaceParams[] params) {
|
||||
// Verify that the task position remains the same
|
||||
RectF newAppBounds = new RectF(mAppBounds);
|
||||
p.matrix.mapRect(newAppBounds);
|
||||
params[0].matrix.mapRect(newAppBounds);
|
||||
Assert.assertThat(newAppBounds, new AlmostSame(mAppBounds));
|
||||
|
||||
System.err.println("Bounds mapped: " + mAppBounds + " => " + newAppBounds);
|
||||
|
||||
@@ -114,6 +114,7 @@ import android.view.accessibility.AccessibilityEvent;
|
||||
import android.view.animation.OvershootInterpolator;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.Toast;
|
||||
import android.window.OnBackInvokedDispatcher;
|
||||
|
||||
import androidx.annotation.CallSuper;
|
||||
import androidx.annotation.NonNull;
|
||||
@@ -543,6 +544,8 @@ public class Launcher extends StatefulActivity<LauncherState>
|
||||
getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
|
||||
}
|
||||
setTitle(R.string.home_screen);
|
||||
|
||||
registerOnBackInvokedCallback();
|
||||
}
|
||||
|
||||
protected LauncherOverlayManager getDefaultOverlay() {
|
||||
@@ -2062,6 +2065,17 @@ public class Launcher extends StatefulActivity<LauncherState>
|
||||
mStateManager.getState().onBackPressed(this);
|
||||
}
|
||||
|
||||
private void registerOnBackInvokedCallback() {
|
||||
if (Utilities.ATLEAST_T) {
|
||||
getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
|
||||
OnBackInvokedDispatcher.PRIORITY_DEFAULT,
|
||||
() -> {
|
||||
onBackPressed();
|
||||
TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "onBackInvoked");
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
protected void onScreenOff() {
|
||||
// Reset AllApps to its initial state only if we are not in the middle of
|
||||
// processing a multi-step drop
|
||||
|
||||
@@ -491,6 +491,7 @@ public abstract class BaseAllAppsContainerView<T extends Context & ActivityConte
|
||||
|
||||
mAllAppsStore.unregisterIconContainer(mAH.get(AdapterHolder.MAIN).mRecyclerView);
|
||||
mAllAppsStore.unregisterIconContainer(mAH.get(AdapterHolder.WORK).mRecyclerView);
|
||||
mAllAppsStore.unregisterIconContainer(mAH.get(AdapterHolder.SEARCH).mRecyclerView);
|
||||
|
||||
if (mUsingTabs) {
|
||||
mAH.get(AdapterHolder.MAIN).setup(mViewPager.getChildAt(0), mPersonalMatcher);
|
||||
@@ -523,6 +524,7 @@ public abstract class BaseAllAppsContainerView<T extends Context & ActivityConte
|
||||
|
||||
mAllAppsStore.registerIconContainer(mAH.get(AdapterHolder.MAIN).mRecyclerView);
|
||||
mAllAppsStore.registerIconContainer(mAH.get(AdapterHolder.WORK).mRecyclerView);
|
||||
mAllAppsStore.registerIconContainer(mAH.get(AdapterHolder.SEARCH).mRecyclerView);
|
||||
}
|
||||
|
||||
protected void updateSearchResultsVisibility() {
|
||||
|
||||
@@ -233,6 +233,7 @@ public class SearchTransitionController {
|
||||
private void onSearchChildAttached(View child) {
|
||||
// Avoid allocating hardware layers for alpha changes.
|
||||
child.forceHasOverlappingRendering(false);
|
||||
child.setPivotY(0);
|
||||
if (mSearchToAzProgress > 0) {
|
||||
// Before the child is rendered, apply the animation including it to avoid flicker.
|
||||
updateSearchRecyclerViewProgress();
|
||||
|
||||
@@ -298,10 +298,8 @@ public final class FeatureFlags {
|
||||
"Enable option to log the keyboard latency for both atomic and controlled keyboard "
|
||||
+ "animations on an EditText");
|
||||
|
||||
// Change of wallpaper depth in widget picker is disabled for tests as it causes flakiness on
|
||||
// very slow cuttlefish devices.
|
||||
public static final BooleanFlag ENABLE_WIDGET_PICKER_DEPTH = new DeviceFlag(
|
||||
"ENABLE_WIDGET_PICKER_DEPTH", true, "Enable changing depth in widget picker.");
|
||||
"ENABLE_WIDGET_PICKER_DEPTH", false, "Enable changing depth in widget picker.");
|
||||
|
||||
public static void initialize(Context context) {
|
||||
synchronized (sDebugFlags) {
|
||||
|
||||
@@ -35,6 +35,7 @@ import com.android.launcher3.tapl.Widget;
|
||||
import com.android.launcher3.tapl.WidgetResizeFrame;
|
||||
import com.android.launcher3.ui.AbstractLauncherUiTest;
|
||||
import com.android.launcher3.ui.TaplTestsLauncher3;
|
||||
import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;
|
||||
import com.android.launcher3.util.rule.ShellCommandRule;
|
||||
import com.android.launcher3.views.DoubleShadowBubbleTextView;
|
||||
import com.android.launcher3.widget.LauncherAppWidgetHostView;
|
||||
@@ -145,22 +146,26 @@ public class ReorderWidgets extends AbstractLauncherUiTest {
|
||||
runTestCase(testCaseMap.get(iconGridDimensions));
|
||||
}
|
||||
|
||||
@ScreenRecord // b/242323136
|
||||
@Test
|
||||
public void simpleReorder() throws ExecutionException, InterruptedException {
|
||||
runTestCaseMap(SimpleReorderCase.TEST_BY_GRID_SIZE,
|
||||
SimpleReorderCase.class.getSimpleName());
|
||||
}
|
||||
|
||||
@ScreenRecord // b/242323136
|
||||
@Test
|
||||
public void pushTest() throws ExecutionException, InterruptedException {
|
||||
runTestCaseMap(PushReorderCase.TEST_BY_GRID_SIZE, PushReorderCase.class.getSimpleName());
|
||||
}
|
||||
|
||||
@ScreenRecord // b/242323136
|
||||
@Test
|
||||
public void fullReorder() throws ExecutionException, InterruptedException {
|
||||
runTestCaseMap(FullReorderCase.TEST_BY_GRID_SIZE, FullReorderCase.class.getSimpleName());
|
||||
}
|
||||
|
||||
@ScreenRecord // b/242323136
|
||||
@Test
|
||||
public void moveOutReorder() throws ExecutionException, InterruptedException {
|
||||
runTestCaseMap(MoveOutReorderCase.TEST_BY_GRID_SIZE,
|
||||
|
||||
@@ -85,10 +85,9 @@ public abstract class Launchable {
|
||||
}
|
||||
|
||||
Point startDrag(long downTime, Runnable expectLongClickEvents, boolean runToSpringLoadedState) {
|
||||
Point iconCenter = getObject().getVisibleCenter();
|
||||
final Point displaySize = mLauncher.getRealDisplaySize();
|
||||
final Point dragStartCenter = new Point(displaySize.x / 2,
|
||||
displaySize.y / 2 - getStartDragThreshold());
|
||||
final Point iconCenter = getObject().getVisibleCenter();
|
||||
final Point dragStartCenter = new Point(iconCenter.x,
|
||||
iconCenter.y - getStartDragThreshold());
|
||||
|
||||
if (runToSpringLoadedState) {
|
||||
mLauncher.runToState(() -> movePointerForStartDrag(
|
||||
|
||||
@@ -110,8 +110,11 @@ public final class LauncherInstrumentation {
|
||||
static final Pattern EVENT_TOUCH_UP_TIS = getTouchEventPatternTIS("ACTION_UP");
|
||||
static final Pattern EVENT_TOUCH_CANCEL_TIS = getTouchEventPatternTIS("ACTION_CANCEL");
|
||||
|
||||
static final Pattern EVENT_KEY_BACK_DOWN = getKeyEventPattern("ACTION_DOWN", "KEYCODE_BACK");
|
||||
static final Pattern EVENT_KEY_BACK_UP = getKeyEventPattern("ACTION_UP", "KEYCODE_BACK");
|
||||
private static final Pattern EVENT_KEY_BACK_DOWN =
|
||||
getKeyEventPattern("ACTION_DOWN", "KEYCODE_BACK");
|
||||
private static final Pattern EVENT_KEY_BACK_UP =
|
||||
getKeyEventPattern("ACTION_UP", "KEYCODE_BACK");
|
||||
private static final Pattern EVENT_ON_BACK_INVOKED = Pattern.compile("onBackInvoked");
|
||||
|
||||
private final String mLauncherPackage;
|
||||
private Boolean mIsLauncher3;
|
||||
@@ -990,8 +993,12 @@ public final class LauncherInstrumentation {
|
||||
}
|
||||
}
|
||||
if (launcherVisible) {
|
||||
expectEvent(TestProtocol.SEQUENCE_MAIN, EVENT_KEY_BACK_DOWN);
|
||||
expectEvent(TestProtocol.SEQUENCE_MAIN, EVENT_KEY_BACK_UP);
|
||||
if (getContext().getApplicationInfo().isOnBackInvokedCallbackEnabled()) {
|
||||
expectEvent(TestProtocol.SEQUENCE_MAIN, EVENT_ON_BACK_INVOKED);
|
||||
} else {
|
||||
expectEvent(TestProtocol.SEQUENCE_MAIN, EVENT_KEY_BACK_DOWN);
|
||||
expectEvent(TestProtocol.SEQUENCE_MAIN, EVENT_KEY_BACK_UP);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user