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

Merge "Let createSetStateAnimator return null when needed" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-30 21:19:10 +00:00
committed by Android (Google) Code Review
parent d9dd02b451 f6c231d575
commit b42c293a82
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
View File

@@ -35,8 +35,6 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_S
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ValueAnimator;
import android.annotation.Nullable;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.util.Log;
@@ -45,6 +43,7 @@ import android.view.View;
import android.view.ViewConfiguration;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.android.internal.jank.InteractionJankMonitor;
@@ -697,15 +696,26 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
}
public void applyState(long duration) {
createApplyStateAnimator(duration).start();
Animator animator = createApplyStateAnimator(duration);
if (animator != null) {
animator.start();
}
}
public void applyState(long duration, long startDelay) {
Animator animator = createApplyStateAnimator(duration);
animator.setStartDelay(startDelay);
animator.start();
if (animator != null) {
animator.setStartDelay(startDelay);
animator.start();
}
}
/**
* Returns an animator which applies the latest state if mIsStashed is changed, or {@code null}
* otherwise.
*/
@Nullable
public Animator createApplyStateAnimator(long duration) {
return mStatePropertyHolder.createSetStateAnimator(mState, duration);
}
@@ -946,9 +956,9 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
* creating a new animation (stored in mAnimator).
* @param flags The latest flags to apply (see the top of this file).
* @param duration The length of the animation.
* @return mAnimator if mIsStashed changed or an empty animator.
* @return mAnimator if mIsStashed changed, or {@code null} otherwise.
*/
@NonNull
@Nullable
public Animator createSetStateAnimator(int flags, long duration) {
int changedFlags = mPrevFlags ^ flags;
if (mPrevFlags != flags) {
@@ -977,7 +987,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
createAnimToIsStashed(mIsStashed, duration, /* animateBg= */ true, changedFlags);
return mAnimator;
}
return ValueAnimator.ofFloat(0, 1).setDuration(duration);
return null;
}
}
}