cd6abc19a8
One way to reproduce this issue is to run `adb shell input keyevent KEYCODE_HOME`, which happens to pause and immediately resume launcher. For example, let's say we run this while in All Apps. Because the isResumed=true comes before the state transition to Normal, we behave as if we are still going to All Apps, specifically goingToUnstashedState = false (since we stash in All Apps). To fix this, we now listen to state changes while the resume alignment animation is playing, and update it if necessary.
Also did the same correction for the gesture alignment animation, though I don't have a specific repo for that.
Finally, because there are now more triggers for alignment animations to play, we add a check to only play them if it's not animating to the same value it's already animating towards. One notable experience this improves is swiping down from All Apps to home; if you do it quick enough, the state animation ends before the taskbar unstash animation, and thus the unstash animation would cancel and start again with the full duration, making it look laggy/disjointed (this behavior existed before this change as well).
Test: TaplTestsQuickstep
Test: Go to All Apps, run `adb shell input keyevent KEYCODE_HOME`, open an app and ensure taskbar icons are visible
Test: Quick switch from home when taskbar is present in apps, but instead go to overview; ensure no jump when taskbar stashes
Test: Swipe down quickly from All Apps, ensure taskbar unstashing doesn't slow down when reaching the end of the state transition
Fixes: 214562370
Change-Id: Ie0c6140e14186e41c7e4748dc745f87349b084fe
Merged-In: Ie0c6140e14186e41c7e4748dc745f87349b084fe
(cherry picked from commit 5fa2ed27bf)
128 lines
3.7 KiB
Java
128 lines
3.7 KiB
Java
/*
|
|
* Copyright (C) 2017 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;
|
|
|
|
import android.animation.Animator;
|
|
import android.animation.AnimatorListenerAdapter;
|
|
import android.animation.ObjectAnimator;
|
|
import android.util.FloatProperty;
|
|
|
|
/**
|
|
* A mutable float which allows animating the value
|
|
*/
|
|
public class AnimatedFloat {
|
|
|
|
public static final FloatProperty<AnimatedFloat> VALUE =
|
|
new FloatProperty<AnimatedFloat>("value") {
|
|
@Override
|
|
public void setValue(AnimatedFloat obj, float v) {
|
|
obj.updateValue(v);
|
|
}
|
|
|
|
@Override
|
|
public Float get(AnimatedFloat obj) {
|
|
return obj.value;
|
|
}
|
|
};
|
|
|
|
private static final Runnable NO_OP = () -> { };
|
|
|
|
private final Runnable mUpdateCallback;
|
|
private ObjectAnimator mValueAnimator;
|
|
// Only non-null when an animation is playing to this value.
|
|
private Float mEndValue;
|
|
|
|
public float value;
|
|
|
|
public AnimatedFloat() {
|
|
this(NO_OP);
|
|
}
|
|
|
|
public AnimatedFloat(Runnable updateCallback) {
|
|
mUpdateCallback = updateCallback;
|
|
}
|
|
|
|
/**
|
|
* Returns an animation from the current value to the given value.
|
|
*/
|
|
public ObjectAnimator animateToValue(float end) {
|
|
return animateToValue(value, end);
|
|
}
|
|
|
|
/**
|
|
* Returns an animation from the given start value to the given end value.
|
|
*/
|
|
public ObjectAnimator animateToValue(float start, float end) {
|
|
cancelAnimation();
|
|
mValueAnimator = ObjectAnimator.ofFloat(this, VALUE, start, end);
|
|
mValueAnimator.addListener(new AnimatorListenerAdapter() {
|
|
@Override
|
|
public void onAnimationStart(Animator animator) {
|
|
if (mValueAnimator == animator) {
|
|
mEndValue = end;
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void onAnimationEnd(Animator animator) {
|
|
if (mValueAnimator == animator) {
|
|
mValueAnimator = null;
|
|
mEndValue = null;
|
|
}
|
|
}
|
|
});
|
|
return mValueAnimator;
|
|
}
|
|
|
|
/**
|
|
* Changes the value and calls the callback.
|
|
* Note that the value can be directly accessed as well to avoid notifying the callback.
|
|
*/
|
|
public void updateValue(float v) {
|
|
if (Float.compare(v, value) != 0) {
|
|
value = v;
|
|
mUpdateCallback.run();
|
|
}
|
|
}
|
|
|
|
public void cancelAnimation() {
|
|
if (mValueAnimator != null) {
|
|
mValueAnimator.cancel();
|
|
}
|
|
}
|
|
|
|
public void finishAnimation() {
|
|
if (mValueAnimator != null && mValueAnimator.isRunning()) {
|
|
mValueAnimator.end();
|
|
}
|
|
}
|
|
|
|
public ObjectAnimator getCurrentAnimation() {
|
|
return mValueAnimator;
|
|
}
|
|
|
|
public boolean isAnimating() {
|
|
return mValueAnimator != null;
|
|
}
|
|
|
|
/**
|
|
* Returns whether we are currently animating, and the animation's end value matches the given.
|
|
*/
|
|
public boolean isAnimatingToValue(float endValue) {
|
|
return isAnimating() && mEndValue != null && mEndValue == endValue;
|
|
}
|
|
}
|