From 2c9b1043a60d5dc93543fa24d9dd8eea3d481ff8 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 4 Dec 2018 18:40:51 +0000 Subject: [PATCH] Revert "Rounded corners on app transitions" This reverts commit d0ab1d0578052114475b1f704a16ffaadea400f5. Reason for revert: Change-Id: Id37615986fc859f3f2d9344402b737926fb7b9a5 --- quickstep/res/values/dimens.xml | 2 +- .../LauncherAppTransitionManagerImpl.java | 27 ++++--------------- .../quickstep/ActivityControlHelper.java | 2 +- .../quickstep/OverviewCommandHelper.java | 2 +- .../android/quickstep/RecentsActivity.java | 2 +- .../com/android/quickstep/RecentsModel.java | 26 ------------------ .../WindowTransformSwipeHandler.java | 3 +-- .../quickstep/util/ClipAnimationHelper.java | 22 +++------------ .../quickstep/util/TaskViewDrawable.java | 2 +- 9 files changed, 15 insertions(+), 73 deletions(-) diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index e0c4e4baa1..49c4492b60 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -19,7 +19,7 @@ 24dp 12dp 48dp - 8dp + 2dp 10dp 70dp 20dp diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java index 1049cca597..9e85469363 100644 --- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java +++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java @@ -67,7 +67,6 @@ import com.android.launcher3.graphics.DrawableFactory; import com.android.launcher3.shortcuts.DeepShortcutView; import com.android.launcher3.util.MultiValueAlpha; import com.android.launcher3.util.MultiValueAlpha.AlphaProperty; -import com.android.quickstep.RecentsModel; import com.android.quickstep.util.ClipAnimationHelper; import com.android.quickstep.util.MultiValueUpdateListener; import com.android.quickstep.util.RemoteAnimationProvider; @@ -293,7 +292,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag ? RECENTS_QUICKSCRUB_LAUNCH_DURATION : RECENTS_LAUNCH_DURATION; - ClipAnimationHelper helper = new ClipAnimationHelper(mLauncher); + ClipAnimationHelper helper = new ClipAnimationHelper(); target.play(getRecentsWindowAnimator(taskView, skipLauncherChanges, targets, helper) .setDuration(duration)); @@ -615,13 +614,6 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag float transX0 = floatingViewBounds[0] - offsetX; float transY0 = floatingViewBounds[1] - offsetY; - // Animate window corner radius from 100% to windowCornerRadius. - float windowCornerRadius = RecentsModel.INSTANCE.get(mLauncher) - .getWindowCornerRadius(); - float circleRadius = scaledWindowWidth / 2f; - float windowRadius = Utilities.mapRange(easePercent, circleRadius, - windowCornerRadius); - // Animate the window crop so that it starts off as a square, and then reveals // horizontally. float cropHeight = windowHeight * easePercent + windowWidth * (1 - easePercent); @@ -636,24 +628,20 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag RemoteAnimationTargetCompat target = targets[i]; Rect targetCrop; - final float alpha; - final float cornerRadius; + float alpha; if (target.mode == MODE_OPENING) { matrix.setScale(scale, scale); matrix.postTranslate(transX0, transY0); targetCrop = crop; alpha = mAlpha.value; - cornerRadius = windowRadius; } else { matrix.setTranslate(target.position.x, target.position.y); alpha = 1f; targetCrop = target.sourceContainerBounds; - cornerRadius = 0; } params[i] = new SurfaceParams(target.leash, alpha, matrix, targetCrop, - RemoteAnimationProvider.getLayer(target, MODE_OPENING), - cornerRadius); + RemoteAnimationProvider.getLayer(target, MODE_OPENING)); } surfaceApplier.scheduleApply(params); } @@ -745,7 +733,6 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag Matrix matrix = new Matrix(); ValueAnimator closingAnimator = ValueAnimator.ofFloat(0, 1); int duration = CLOSING_TRANSITION_DURATION_MS; - float windowCornerRadius = RecentsModel.INSTANCE.get(mLauncher).getWindowCornerRadius(); closingAnimator.setDuration(duration); closingAnimator.addUpdateListener(new MultiValueUpdateListener() { FloatProp mDy = new FloatProp(0, mClosingWindowTransY, 0, duration, DEACCEL_1_7); @@ -757,8 +744,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag SurfaceParams[] params = new SurfaceParams[targets.length]; for (int i = targets.length - 1; i >= 0; i--) { RemoteAnimationTargetCompat target = targets[i]; - final float alpha; - final float cornerRadius; + float alpha; if (target.mode == MODE_CLOSING) { matrix.setScale(mScale.value, mScale.value, target.sourceContainerBounds.centerX(), @@ -766,16 +752,13 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag matrix.postTranslate(0, mDy.value); matrix.postTranslate(target.position.x, target.position.y); alpha = mAlpha.value; - cornerRadius = windowCornerRadius; } else { matrix.setTranslate(target.position.x, target.position.y); alpha = 1f; - cornerRadius = 0f; } params[i] = new SurfaceParams(target.leash, alpha, matrix, target.sourceContainerBounds, - RemoteAnimationProvider.getLayer(target, MODE_CLOSING), - cornerRadius); + RemoteAnimationProvider.getLayer(target, MODE_CLOSING)); } surfaceApplier.scheduleApply(params); } diff --git a/quickstep/src/com/android/quickstep/ActivityControlHelper.java b/quickstep/src/com/android/quickstep/ActivityControlHelper.java index d78ba9c9f9..b96f9f0672 100644 --- a/quickstep/src/com/android/quickstep/ActivityControlHelper.java +++ b/quickstep/src/com/android/quickstep/ActivityControlHelper.java @@ -332,7 +332,7 @@ public interface ActivityControlHelper { float prevRvScale = recentsView.getScaleX(); float targetRvScale = endState.getOverviewScaleAndTranslationYFactor(launcher)[0]; SCALE_PROPERTY.set(recentsView, targetRvScale); - ClipAnimationHelper clipHelper = new ClipAnimationHelper(launcher); + ClipAnimationHelper clipHelper = new ClipAnimationHelper(); clipHelper.fromTaskThumbnailView(v.getThumbnail(), (RecentsView) v.getParent(), null); SCALE_PROPERTY.set(recentsView, prevRvScale); diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java index 61bb75f857..f8f09055f0 100644 --- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java +++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java @@ -326,7 +326,7 @@ public class OverviewCommandHelper { return anim; } - final ClipAnimationHelper clipHelper = new ClipAnimationHelper(mActivity); + final ClipAnimationHelper clipHelper = new ClipAnimationHelper(); // At this point, the activity is already started and laid-out. Get the home-bounds // relative to the screen using the rootView of the activity. diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java index deedd324a8..9d01f74477 100644 --- a/quickstep/src/com/android/quickstep/RecentsActivity.java +++ b/quickstep/src/com/android/quickstep/RecentsActivity.java @@ -183,7 +183,7 @@ public class RecentsActivity extends BaseDraggingActivity { RemoteAnimationTargetCompat[] targets) { AnimatorSet target = new AnimatorSet(); boolean activityClosing = taskIsATargetWithMode(targets, getTaskId(), MODE_CLOSING); - ClipAnimationHelper helper = new ClipAnimationHelper(this); + ClipAnimationHelper helper = new ClipAnimationHelper(); target.play(getRecentsWindowAnimator(taskView, !activityClosing, targets, helper) .setDuration(RECENTS_LAUNCH_DURATION)); diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java index a62e6adfae..2e4d4d2b83 100644 --- a/quickstep/src/com/android/quickstep/RecentsModel.java +++ b/quickstep/src/com/android/quickstep/RecentsModel.java @@ -45,9 +45,6 @@ import androidx.annotation.WorkerThread; */ @TargetApi(Build.VERSION_CODES.O) public class RecentsModel extends TaskStackChangeListener { - - private static final String TAG = "RecentsModel"; - // We do not need any synchronization for this variable as its only written on UI thread. public static final MainThreadInitializedObject INSTANCE = new MainThreadInitializedObject<>(c -> new RecentsModel(c)); @@ -65,9 +62,6 @@ public class RecentsModel extends TaskStackChangeListener { private final TaskIconCache mIconCache; private final TaskThumbnailCache mThumbnailCache; - private float mWindowCornerRadius = -1; - - private RecentsModel(Context context) { mContext = context; @@ -180,26 +174,6 @@ public class RecentsModel extends TaskStackChangeListener { return mSystemUiProxy; } - public float getWindowCornerRadius() { - // The window corner radius is expressed in pixels and won't change if the - // display density changes. It's safe to cache the value. - if (mWindowCornerRadius == -1) { - if (mSystemUiProxy != null) { - try { - mWindowCornerRadius = mSystemUiProxy.getWindowCornerRadius(); - } catch (RemoteException e) { - Log.w(TAG, "Connection to ISystemUIProxy was lost, ignoring window corner " - + "radius"); - return 0; - } - } else { - Log.w(TAG, "ISystemUIProxy is null, ignoring window corner radius"); - return 0; - } - } - return mWindowCornerRadius; - } - public void onTrimMemory(int level) { if (level == ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN) { mThumbnailCache.getHighResLoadingState().setVisible(false); diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java index f4b2febe71..fe3300d36f 100644 --- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -175,7 +175,7 @@ public class WindowTransformSwipeHandler { private static final float SWIPE_DURATION_MULTIPLIER = Math.min(1 / MIN_PROGRESS_FOR_OVERVIEW, 1 / (1 - MIN_PROGRESS_FOR_OVERVIEW)); - private final ClipAnimationHelper mClipAnimationHelper; + private final ClipAnimationHelper mClipAnimationHelper = new ClipAnimationHelper(); protected Runnable mGestureEndCallback; protected boolean mIsGoingToHome; @@ -255,7 +255,6 @@ public class WindowTransformSwipeHandler { mTouchInteractionLog = touchInteractionLog; mRecentsAnimationWrapper = new RecentsAnimationWrapper(inputConsumer, this::createNewTouchProxyHandler); - mClipAnimationHelper = new ClipAnimationHelper(context); initStateCallbacks(); } diff --git a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java index f254244944..57a0e8f8f7 100644 --- a/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java +++ b/quickstep/src/com/android/quickstep/util/ClipAnimationHelper.java @@ -21,7 +21,6 @@ import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MOD import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MODE_OPENING; import android.annotation.TargetApi; -import android.content.Context; import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.Matrix.ScaleToFit; @@ -32,8 +31,6 @@ import android.os.Build; import android.os.RemoteException; import android.view.animation.Interpolator; -import androidx.annotation.Nullable; - import com.android.launcher3.BaseDraggingActivity; import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; @@ -53,6 +50,8 @@ import com.android.systemui.shared.system.WindowManagerWrapper; import java.util.function.BiFunction; +import androidx.annotation.Nullable; + /** * Utility class to handle window clip animation */ @@ -83,10 +82,6 @@ public class ClipAnimationHelper { private final Matrix mTmpMatrix = new Matrix(); private final RectF mTmpRectF = new RectF(); private final RectF mCurrentRectWithInsets = new RectF(); - // Corner radius of windows, in pixels - private final float mWindowCornerRadius; - // Corner radius of windows when they're in overview mode. - private final float mTaskCornerRadius; private float mTargetScale = 1f; private float mOffsetScale = 1f; @@ -100,11 +95,6 @@ public class ClipAnimationHelper { private BiFunction mTaskAlphaCallback = (t, a1) -> a1; - public ClipAnimationHelper(Context context) { - mTaskCornerRadius = context.getResources().getDimension(R.dimen.task_corner_radius); - mWindowCornerRadius = RecentsModel.INSTANCE.get(context).getWindowCornerRadius(); - } - private void updateSourceStack(RemoteAnimationTargetCompat target) { mSourceInsets.set(target.contentInsets); mSourceStackBounds.set(target.sourceContainerBounds); @@ -178,15 +168,11 @@ public class ClipAnimationHelper { Rect crop = app.sourceContainerBounds; float alpha = 1f; int layer; - float cornerRadius = 0f; if (app.mode == targetSet.targetMode) { if (app.activityType != RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME) { mTmpMatrix.setRectToRect(mSourceRect, currentRect, ScaleToFit.FILL); mTmpMatrix.postTranslate(app.position.x, app.position.y); mClipRectF.roundOut(crop); - float scale = crop.width() / currentRect.width(); - cornerRadius = Utilities.mapRange(progress, mWindowCornerRadius, - mTaskCornerRadius * scale); } if (app.isNotInRecents @@ -200,7 +186,7 @@ public class ClipAnimationHelper { crop = null; layer = Integer.MAX_VALUE; } - params[i] = new SurfaceParams(app.leash, alpha, mTmpMatrix, crop, layer, cornerRadius); + params[i] = new SurfaceParams(app.leash, alpha, mTmpMatrix, crop, layer); } applyParams(syncTransactionApplier, params); return currentRect; @@ -329,7 +315,7 @@ public class ClipAnimationHelper { -mSourceWindowClipInsets.top * insetProgress, ttv.getMeasuredWidth() + mSourceWindowClipInsets.right * insetProgress, ttv.getMeasuredHeight() + mSourceWindowClipInsets.bottom * insetProgress, - Utilities.mapRange(progress, mWindowCornerRadius, ttv.getCornerRadius())); + ttv.getCornerRadius() * progress); } public RectF getTargetRect() { diff --git a/quickstep/src/com/android/quickstep/util/TaskViewDrawable.java b/quickstep/src/com/android/quickstep/util/TaskViewDrawable.java index 6ee305f802..48b07a7144 100644 --- a/quickstep/src/com/android/quickstep/util/TaskViewDrawable.java +++ b/quickstep/src/com/android/quickstep/util/TaskViewDrawable.java @@ -71,7 +71,7 @@ public class TaskViewDrawable extends Drawable { Utilities.getDescendantCoordRelativeToAncestor(mIconView, parent, mIconPos, true); mThumbnailView = tv.getThumbnail(); - mClipAnimationHelper = new ClipAnimationHelper(parent.getContext()); + mClipAnimationHelper = new ClipAnimationHelper(); mClipAnimationHelper.fromTaskThumbnailView(mThumbnailView, parent); }