aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 23:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix icon flash on app launch

Browse Source 
Flag: com.android.launcher3.enable_additional_home_animations
Fixes: 343051344
Test: temp logs, launched apps from home, quickly swiped home while quick switching
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9fb1f8043573d5bc3376f0786354fc8f7a9cf2cd)
Merged-In: I91071d53f753eb7bc99305c46241de203bcfdc98
Change-Id: I91071d53f753eb7bc99305c46241de203bcfdc98
This commit is contained in:
Schneider Victor-tulias
2024-06-12 13:46:35 -04:00
committed by Android Build Coastguard Worker
parent 40c4382060
commit cb2a1474a7
4 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
View File

@@ -17,6 +17,7 @@ package com.android.quickstep;
import static com.android.app.animation.Interpolators.ACCELERATE_1_5;
import static com.android.app.animation.Interpolators.LINEAR;
import static com.android.launcher3.Flags.enableAdditionalHomeAnimations;
import static com.android.launcher3.PagedView.INVALID_PAGE;
import android.animation.Animator;
@@ -449,7 +450,7 @@ public abstract class SwipeUpAnimationLogic implements
float alpha = mAnimationFactory.getWindowAlpha(progress);
mHomeAnim.setPlayFraction(progress);
if (mTargetTaskView == null) {
if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) {
mHomeToWindowPositionMap.mapRect(mWindowCurrentRect, currentRect);
mMatrix.setRectToRect(mCropRectF, mWindowCurrentRect, ScaleToFit.FILL);
mLocalTransformParams
@@ -464,10 +465,15 @@ public abstract class SwipeUpAnimationLogic implements
mLocalTransformParams.applySurfaceParams(
mLocalTransformParams.createSurfaceParams(this));
mAnimationFactory.update(
currentRect, progress, mMatrix.mapRadius(cornerRadius), (int) (alpha * 255));
if (mTargetTaskView == null) {
mAnimationFactory.update(
currentRect,
progress,
mMatrix.mapRadius(cornerRadius),
!enableAdditionalHomeAnimations() || mTargetTaskView == null
? 0 : (int) (alpha * 255));
if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) {
return;
}
if (mAnimationFactory.isAnimatingIntoIcon() && mAnimationFactory.isAnimationReady()) {
@@ -506,7 +512,7 @@ public abstract class SwipeUpAnimationLogic implements
public void onAnimationStart(Animator animation) {
setUp();
mHomeAnim.dispatchOnStart();
if (mTargetTaskView == null) {
if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) {
return;
}
Rect thumbnailBounds = new Rect();
@@ -521,7 +527,7 @@ public abstract class SwipeUpAnimationLogic implements
}
private void setUp() {
if (mTargetTaskView == null) {
if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) {
return;
}
RecentsView recentsView = mTargetTaskView.getRecentsView();
@@ -542,7 +548,7 @@ public abstract class SwipeUpAnimationLogic implements
}
private void cleanUp() {
if (mTargetTaskView == null) {
if (!enableAdditionalHomeAnimations() || mTargetTaskView == null) {
return;
}
RecentsView recentsView = mTargetTaskView.getRecentsView();

4
quickstep/src/com/android/quickstep/views/RecentsView.java
View File

@@ -35,6 +35,7 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_REBIND_SAFE;
import static com.android.launcher3.AbstractFloatingView.TYPE_TASK_MENU;
import static com.android.launcher3.AbstractFloatingView.getTopOpenViewWithType;
import static com.android.launcher3.BaseActivity.STATE_HANDLER_INVISIBILITY_FLAGS;
import static com.android.launcher3.Flags.enableAdditionalHomeAnimations;
import static com.android.launcher3.Flags.enableGridOnlyOverview;
import static com.android.launcher3.Flags.enableRefactorTaskThumbnail;
import static com.android.launcher3.LauncherAnimUtils.SUCCESS_TRANSITION_PROGRESS;
@@ -4523,6 +4524,9 @@ public abstract class RecentsView<CONTAINER_TYPE extends Context & RecentsViewCo
* than the running task, when updating page offsets.
*/
public void setOffsetMidpointIndexOverride(int offsetMidpointIndexOverride) {
if (!enableAdditionalHomeAnimations()) {
return;
}
mOffsetMidpointIndexOverride = offsetMidpointIndexOverride;
updatePageOffsets();
}

4
src/com/android/launcher3/views/ClipIconView.java
View File

@@ -16,6 +16,7 @@
package com.android.launcher3.views;
import static com.android.app.animation.Interpolators.LINEAR;
import static com.android.launcher3.Flags.enableAdditionalHomeAnimations;
import static com.android.launcher3.Utilities.boundToRange;
import static com.android.launcher3.Utilities.mapToRange;
import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
@@ -97,6 +98,9 @@ public class ClipIconView extends View implements ClipPathView {
* within the clip bounds of this view.
*/
public void setTaskViewArtist(TaskViewArtist taskViewArtist) {
if (!enableAdditionalHomeAnimations()) {
return;
}
mTaskViewArtist = taskViewArtist;
invalidate();
}

8
src/com/android/launcher3/views/FloatingIconView.java
View File

@@ -18,6 +18,7 @@ package com.android.launcher3.views;
import static android.view.Gravity.LEFT;
import static com.android.app.animation.Interpolators.LINEAR;
import static com.android.launcher3.Flags.enableAdditionalHomeAnimations;
import static com.android.launcher3.Utilities.getFullDrawable;
import static com.android.launcher3.Utilities.mapToRange;
import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
@@ -164,7 +165,12 @@ public class FloatingIconView extends FrameLayout implements
*/
public void update(float alpha, RectF rect, float progress, float shapeProgressStart,
float cornerRadius, boolean isOpening, int taskViewDrawAlpha) {
setAlpha(isLaidOut() ? alpha : 0f);
// The non-running task home animation has some very funky first few frames because this
// FIV hasn't fully laid out. During those frames, hide this FIV and continue drawing the
// TaskView directly while transforming it in the place of this FIV. However, if we fade
// the TaskView at all, we need to display this FIV regardless.
setAlpha(!enableAdditionalHomeAnimations() || isLaidOut() || taskViewDrawAlpha < 255
? alpha : 0f);
mClipIconView.update(rect, progress, shapeProgressStart, cornerRadius, isOpening, this,
mLauncher.getDeviceProfile(), taskViewDrawAlpha);