PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove LiveTileOverlay" into sc-dev

Browse Source
This commit is contained in:
Tracy Zhou
2021-03-05 21:09:17 +00:00
committed by Android (Google) Code Review
parent 90d5e6bc42 6f25775978
commit 64c6428acc
4 changed files with 4 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+3 -31
View File
@@ -104,7 +104,6 @@ import com.android.quickstep.util.RectFSpringAnim;
import com.android.quickstep.util.SurfaceTransactionApplier;
import com.android.quickstep.util.SwipePipToHomeAnimator;
import com.android.quickstep.util.TransformParams;
import com.android.quickstep.views.LiveTileOverlay;
import com.android.quickstep.views.RecentsView;
import com.android.quickstep.views.TaskView;
import com.android.systemui.shared.recents.model.ThumbnailData;
@@ -353,7 +352,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
mRecentsView = activity.getOverviewPanel();
mRecentsView.setOnPageTransitionEndCallback(null);
addLiveTileOverlay();
mStateCallback.setState(STATE_LAUNCHER_PRESENT);
if (alreadyOnHome) {
@@ -1240,13 +1238,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
updateSysUiFlags(Math.max(p, mCurrentShift.value));
});
anim.addAnimatorListener(new AnimationSuccessListener() {
@Override
public void onAnimationStart(Animator animation) {
if (mActivity != null) {
removeLiveTileOverlay();
}
}
@Override
public void onAnimationSuccess(Animator animator) {
if (mRecentsView != null) {
@@ -1268,7 +1259,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
// In the off chance that the gesture ends before Launcher is started, we should clear
// the callback here so that it doesn't update with the wrong state
mActivity.clearRunOnceOnStartCallback();
resetLauncherListenersAndOverlays();
resetLauncherListeners();
}
if (mGestureState.getEndTarget() != null && !mGestureState.isRunningAnimationToLauncher()) {
cancelCurrentAnimation();
@@ -1351,7 +1342,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
endLauncherTransitionController();
mRecentsView.onGestureAnimationEnd();
resetLauncherListenersAndOverlays();
resetLauncherListeners();
}
private void endLauncherTransitionController() {
@@ -1364,13 +1355,12 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
}
}
private void resetLauncherListenersAndOverlays() {
private void resetLauncherListeners() {
// Reset the callback for deferred activity launches
if (!LIVE_TILE.get()) {
mActivityInterface.setOnDeferredActivityLaunchCallback(null);
}
mActivity.getRootView().setOnApplyWindowInsetsListener(null);
removeLiveTileOverlay();
}
private void notifyTransitionCancelled() {
@@ -1594,17 +1584,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
anim.start();
}
private void addLiveTileOverlay() {
if (LiveTileOverlay.INSTANCE.attach(mActivity.getRootView().getOverlay())) {
mRecentsView.setLiveTileOverlayAttached(true);
}
}
private void removeLiveTileOverlay() {
LiveTileOverlay.INSTANCE.detach(mActivity.getRootView().getOverlay());
mRecentsView.setLiveTileOverlayAttached(false);
}
private static boolean isNotInRecents(RemoteAnimationTargetCompat app) {
return app.isNotInRecents
|| app.activityType == ACTIVITY_TYPE_HOME;
@@ -1765,13 +1744,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
}
mTaskViewSimulator.apply(mTransformParams);
}
if (LIVE_TILE.get() && mRecentsAnimationTargets != null) {
LiveTileOverlay.INSTANCE.update(
mTaskViewSimulator.getCurrentRect(),
mTaskViewSimulator.getCurrentCornerRadius());
LiveTileOverlay.INSTANCE.setRotation(
mTaskViewSimulator.getOrientationState().getDisplayRotation());
}
ProtoTracer.INSTANCE.get(mContext).scheduleFrameUpdate();
}
quickstep/src/com/android/quickstep/views/LiveTileOverlay.java
-190
View File
@@ -1,190 +0,0 @@
package com.android.quickstep.views;
import static android.view.Surface.ROTATION_0;
import static android.view.Surface.ROTATION_180;
import static android.view.Surface.ROTATION_270;
import static android.view.Surface.ROTATION_90;
import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN;
import static com.android.launcher3.anim.Interpolators.LINEAR;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ObjectAnimator;
import android.graphics.Canvas;
import android.graphics.ColorFilter;
import android.graphics.Paint;
import android.graphics.PixelFormat;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffXfermode;
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.drawable.Drawable;
import android.util.FloatProperty;
import android.view.ViewOverlay;
import com.android.launcher3.anim.Interpolators;
import com.android.quickstep.util.RecentsOrientedState.SurfaceRotation;
public class LiveTileOverlay extends Drawable {
private static final long ICON_ANIM_DURATION = 120;
private static final FloatProperty<LiveTileOverlay> PROGRESS =
new FloatProperty<LiveTileOverlay>("progress") {
@Override
public void setValue(LiveTileOverlay liveTileOverlay, float progress) {
liveTileOverlay.setIconAnimationProgress(progress);
}
@Override
public Float get(LiveTileOverlay liveTileOverlay) {
return liveTileOverlay.mIconAnimationProgress;
}
};
public static final LiveTileOverlay INSTANCE = new LiveTileOverlay();
private final Paint mPaint = new Paint();
private final RectF mCurrentRect = new RectF();
private final Rect mBoundsRect = new Rect();
private @SurfaceRotation int mRotation = ROTATION_0;
private float mCornerRadius;
private Drawable mIcon;
private Animator mIconAnimator;
private float mIconAnimationProgress = 0f;
private boolean mIsAttached;
private LiveTileOverlay() {
mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
}
public void update(RectF currentRect, float cornerRadius) {
invalidateSelf();
mCurrentRect.set(currentRect);
mCornerRadius = cornerRadius;
mCurrentRect.roundOut(mBoundsRect);
setBounds(mBoundsRect);
invalidateSelf();
}
public void update(float left, float top, float right, float bottom) {
mCurrentRect.set(left, top, right, bottom);
}
public void setRotation(@SurfaceRotation int rotation) {
mRotation = rotation;
}
public void setIcon(Drawable icon) {
mIcon = icon;
}
// TODO: consider cleaning this up and drawing icon in another way. Previously we place app
// below launcher during the initial swipe up and render the icon in this live tile overlay.
// However, this resulted in a bunch of touch input issues caused by Launcher getting the input
// events during transition (to overview / to another app (quick switch). So now our new
// solution places app on top in live tile until it fully settles in Overview.
public void startIconAnimation() {
if (mIconAnimator != null) {
mIconAnimator.cancel();
}
// This animator must match the icon part of {@link TaskView#FOCUS_TRANSITION} animation.
mIconAnimator = ObjectAnimator.ofFloat(this, PROGRESS, 1);
mIconAnimator.setDuration(ICON_ANIM_DURATION).setInterpolator(LINEAR);
mIconAnimator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
mIconAnimator = null;
}
});
mIconAnimator.start();
}
public float cancelIconAnimation() {
if (mIconAnimator != null) {
mIconAnimator.cancel();
}
return mIconAnimationProgress;
}
@Override
public void draw(Canvas canvas) {
canvas.drawRoundRect(mCurrentRect, mCornerRadius, mCornerRadius, mPaint);
if (mIcon != null && mIconAnimationProgress > 0f) {
canvas.save();
float scale = Interpolators.clampToProgress(FAST_OUT_SLOW_IN, 0f,
1f).getInterpolation(mIconAnimationProgress);
int iconRadius = mIcon.getBounds().width() / 2;
float dx = 0;
float dy = 0;
switch (mRotation) {
case ROTATION_0:
dx = mCurrentRect.centerX() - iconRadius * scale;
dy = mCurrentRect.top - iconRadius * scale;
break;
case ROTATION_90:
dx = mCurrentRect.right - iconRadius * scale;
dy = mCurrentRect.centerY() - iconRadius * scale;
break;
case ROTATION_270:
dx = mCurrentRect.left - iconRadius * scale;
dy = mCurrentRect.centerY() - iconRadius * scale;
break;
case ROTATION_180:
dx = mCurrentRect.centerX() - iconRadius * scale;
dy = mCurrentRect.bottom - iconRadius * scale;
break;
}
int rotationDegrees = mRotation * 90;
if (mRotation == ROTATION_90 || mRotation == ROTATION_270) {
canvas.rotate(rotationDegrees, dx + iconRadius, dy + iconRadius);
}
canvas.translate(dx, dy);
canvas.scale(scale, scale);
mIcon.draw(canvas);
canvas.restore();
}
}
@Override
public void setAlpha(int i) { }
@Override
public void setColorFilter(ColorFilter colorFilter) { }
@Override
public int getOpacity() {
return PixelFormat.TRANSLUCENT;
}
public boolean attach(ViewOverlay overlay) {
if (overlay != null && !mIsAttached) {
overlay.add(this);
mIsAttached = true;
return true;
}
return false;
}
public void detach(ViewOverlay overlay) {
if (overlay != null) {
overlay.remove(this);
mIsAttached = false;
}
}
private void setIconAnimationProgress(float progress) {
mIconAnimationProgress = progress;
invalidateSelf();
}
}
quickstep/src/com/android/quickstep/views/RecentsView.java
+1 -19
View File
@@ -422,7 +422,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
private boolean mShowEmptyMessage;
private OnEmptyMessageUpdatedListener mOnEmptyMessageUpdatedListener;
private Layout mEmptyTextLayout;
private boolean mLiveTileOverlayAttached;
// Keeps track of the index where the first TaskView should be
private int mTaskViewStartIndex = 0;
@@ -953,10 +952,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
mLiveTileTaskViewSimulator.taskSecondaryTranslation.value = 0;
mLiveTileTaskViewSimulator.fullScreenProgress.value = 0;
mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
// Reset the live tile rect
DeviceProfile deviceProfile = mActivity.getDeviceProfile();
LiveTileOverlay.INSTANCE.update(0, 0, deviceProfile.widthPx, deviceProfile.heightPx);
}
if (mRunningTaskTileHidden) {
setRunningTaskHidden(mRunningTaskTileHidden);
@@ -1289,10 +1284,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
*/
public void onSwipeUpAnimationSuccess() {
if (getRunningTaskView() != null) {
float startProgress = LIVE_TILE.get() && mLiveTileOverlayAttached
? LiveTileOverlay.INSTANCE.cancelIconAnimation()
: 0f;
animateUpRunningTaskIconScale(startProgress);
animateUpRunningTaskIconScale(0f);
}
setSwipeDownShouldLaunchApp(true);
}
@@ -2614,16 +2606,6 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
}
}
public void setLiveTileOverlayAttached(boolean liveTileOverlayAttached) {
mLiveTileOverlayAttached = liveTileOverlayAttached;
}
public void updateLiveTileIcon(Drawable icon) {
if (mLiveTileOverlayAttached) {
LiveTileOverlay.INSTANCE.setIcon(icon);
}
}
public void finishRecentsAnimation(boolean toRecents, Runnable onFinishComplete) {
if (mRecentsAnimationController == null) {
if (onFinishComplete != null) {
quickstep/src/com/android/quickstep/views/TaskView.java
-3
View File
@@ -559,9 +559,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
mIconLoadRequest = iconCache.updateIconInBackground(mTask,
(task) -> {
setIcon(task.icon);
if (LIVE_TILE.get() && isRunningTask()) {
getRecentsView().updateLiveTileIcon(task.icon);
}
mDigitalWellBeingToast.initialize(mTask);
});
} else {