openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolve merge conflicts of 80605f9823 to ub-launcher3-master 

Change-Id: I1eb6ed58b83f92105e1831c733e98ea44e0c151b
This commit is contained in:
Jonathan Miranda 2020-07-29 20:42:45 +00:00
parent eb268055e1 80605f9823
commit 3a2298d2a4
7 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
quickstep/recents_ui_overrides/src/com/android/quickstep/AbsSwipeUpHandler.java
View File

@ -1172,7 +1172,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends
anim.addAnimatorListener(new AnimationSuccessListener() {
@Override
public void onAnimationStart(Animator animation) {
super.onAnimationStart(animation);
if (mActivity != null) {
removeLiveTileOverlay();
}

1
quickstep/recents_ui_overrides/src/com/android/quickstep/SwipeUpAnimationLogic.java
View File

@ -287,7 +287,6 @@ public abstract class SwipeUpAnimationLogic {
@Override
public void onAnimationStart(Animator animation) {
super.onAnimationStart(animation);
mHomeAnim.dispatchOnStart();
}

1
quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskMenuView.java
View File

@ -282,7 +282,6 @@ public class TaskMenuView extends AbstractFloatingView {
mOpenCloseAnimator.addListener(new AnimationSuccessListener() {
@Override
public void onAnimationStart(Animator animation) {
super.onAnimationStart(animation);
setVisibility(VISIBLE);
}

3
src/com/android/launcher3/anim/AlphaUpdateListener.java
View File

@ -46,8 +46,7 @@ public class AlphaUpdateListener extends AnimationSuccessListener
}
@Override
public void onAnimationStart(Animator animation) {
super.onAnimationStart(animation);
public void onAnimationStart(Animator arg0) {
// We want the views to be visible for animation, so fade-in/out is visible
mView.setVisibility(View.VISIBLE);
}

8
src/com/android/launcher3/anim/AnimationSuccessListener.java
View File

@ -19,8 +19,6 @@ package com.android.launcher3.anim;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import androidx.annotation.CallSuper;
/**
* Extension of {@link AnimatorListenerAdapter} for listening for non-cancelled animations
*/
@ -28,12 +26,6 @@ public abstract class AnimationSuccessListener extends AnimatorListenerAdapter {
protected boolean mCancelled = false;
@Override
@CallSuper
public void onAnimationStart(Animator animation) {
mCancelled = false;
}
@Override
public void onAnimationCancel(Animator animation) {
mCancelled = true;

1
src/com/android/launcher3/anim/AnimatorPlaybackController.java
View File

@ -335,7 +335,6 @@ public class AnimatorPlaybackController implements ValueAnimator.AnimatorUpdateL
@Override
public void onAnimationStart(Animator animation) {
super.onAnimationStart(animation);
mCancelled = false;
mDispatched = false;
}

1
src/com/android/launcher3/statemanager/StateManager.java
View File

@ -315,7 +315,6 @@ public class StateManager<STATE_TYPE extends BaseState<STATE_TYPE>> {
@Override
public void onAnimationStart(Animator animation) {
super.onAnimationStart(animation);
// Change the internal state only when the transition actually starts
onStateTransitionStart(state);
}