.withEndAction(mAnimateKeyguardStatusViewVisibleEndRunnable);
} else if (statusBarState == StatusBarState.KEYGUARD) {
mKeyguardStatusView.animate().cancel();
+ mKeyguardStatusViewAnimating = false;
mKeyguardStatusView.setVisibility(View.VISIBLE);
mKeyguardStatusView.setAlpha(1f);
} else {
mKeyguardStatusView.animate().cancel();
+ mKeyguardStatusViewAnimating = false;
mKeyguardStatusView.setVisibility(View.GONE);
mKeyguardStatusView.setAlpha(1f);
}
}
public void showKeyguard() {
+ if (mLaunchTransitionFadingAway) {
+ mNotificationPanel.animate().cancel();
+ mNotificationPanel.setAlpha(1f);
+ if (mLaunchTransitionEndRunnable != null) {
+ mLaunchTransitionEndRunnable.run();
+ }
+ mLaunchTransitionEndRunnable = null;
+ mLaunchTransitionFadingAway = false;
+ }
setBarState(StatusBarState.KEYGUARD);
updateKeyguardState(false /* goingToFullShade */, false /* fromShadeLocked */);
if (!mScreenOnFromKeyguard) {
* @param endRunnable the runnable to be run when the transition is done
*/
public void fadeKeyguardAfterLaunchTransition(final Runnable beforeFading,
- final Runnable endRunnable) {
+ Runnable endRunnable) {
+ mLaunchTransitionEndRunnable = endRunnable;
Runnable hideRunnable = new Runnable() {
@Override
public void run() {
@Override
public void run() {
mNotificationPanel.setAlpha(1);
- if (endRunnable != null) {
- endRunnable.run();
+ if (mLaunchTransitionEndRunnable != null) {
+ mLaunchTransitionEndRunnable.run();
}
+ mLaunchTransitionEndRunnable = null;
mLaunchTransitionFadingAway = false;
}
});
}
private void setScrimColor(ScrimView scrim, float alpha) {
+ Object runningAnim = scrim.getTag(TAG_KEY_ANIM);
+ if (runningAnim instanceof ValueAnimator) {
+ ((ValueAnimator) runningAnim).cancel();
+ scrim.setTag(TAG_KEY_ANIM, null);
+ }
int color = Color.argb((int) (alpha * 255), 0, 0, 0);
if (mAnimateChange) {
startScrimAnimation(scrim, color);
if (current == targetColor) {
return;
}
- Object runningAnim = scrim.getTag(TAG_KEY_ANIM);
- if (runningAnim instanceof ValueAnimator) {
- ((ValueAnimator) runningAnim).cancel();
- }
ValueAnimator anim = ValueAnimator.ofInt(current, target);
anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override