diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-07 18:59:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-07 18:59:13 +0000 |
commit | 2f0101778dba1436fe43a53fd0a13261cd6b51da (patch) | |
tree | 19bf76d9adbd61608bd5b6dca17d04c419b40c85 | |
parent | ae43d147901d1642dcdb1f6928b02978074ff353 (diff) | |
parent | 717127186a96b9e27edbdf868e85529016025ae4 (diff) | |
download | android_packages_apps_Trebuchet-2f0101778dba1436fe43a53fd0a13261cd6b51da.tar.gz android_packages_apps_Trebuchet-2f0101778dba1436fe43a53fd0a13261cd6b51da.tar.bz2 android_packages_apps_Trebuchet-2f0101778dba1436fe43a53fd0a13261cd6b51da.zip |
Merge "Fix bug where launcher closing animation isn't run." into ub-launcher3-edmonton
-rw-r--r-- | quickstep/src/com/android/quickstep/views/RecentsView.java | 13 | ||||
-rw-r--r-- | src/com/android/launcher3/BaseActivity.java | 9 |
2 files changed, 13 insertions, 9 deletions
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index f04101acf..ce460bc0d 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -16,6 +16,7 @@ package com.android.quickstep.views; +import static com.android.launcher3.BaseActivity.INVISIBLE_BY_STATE_HANDLER; import static com.android.launcher3.anim.Interpolators.ACCEL; import static com.android.launcher3.anim.Interpolators.ACCEL_2; import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN; @@ -153,6 +154,15 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl } }; + private TaskStackChangeListener mTaskStackClearFlagListener = new TaskStackChangeListener() { + @Override + public void onPinnedStackAnimationStarted() { + // Needed for activities that auto-enter PiP, which will not trigger a remote + // animation to be created + mActivity.clearForceInvisibleFlag(INVISIBLE_BY_STATE_HANDLER); + } + }; + private int mLoadPlanId = -1; // Only valid until the launcher state changes to NORMAL @@ -250,6 +260,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl super.onAttachedToWindow(); updateTaskStackListenerState(); mActivity.addMultiWindowModeChangedListener(mMultiWindowModeChangedListener); + ActivityManagerWrapper.getInstance().registerTaskStackListener(mTaskStackClearFlagListener); } @Override @@ -257,6 +268,8 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl super.onDetachedFromWindow(); updateTaskStackListenerState(); mActivity.removeMultiWindowModeChangedListener(mMultiWindowModeChangedListener); + ActivityManagerWrapper.getInstance().unregisterTaskStackListener( + mTaskStackClearFlagListener); } @Override diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index d1334722d..a41edc08b 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -143,15 +143,6 @@ public abstract class BaseActivity extends Activity { } @Override - public void onEnterAnimationComplete() { - super.onEnterAnimationComplete(); - - // Needed for activities that auto-enter PiP, which will not trigger a remote animation to - // be created - clearForceInvisibleFlag(INVISIBLE_BY_STATE_HANDLER); - } - - @Override protected void onStop() { mActivityFlags &= ~ACTIVITY_STATE_STARTED & ~ACTIVITY_STATE_USER_ACTIVE; mForceInvisible = 0; |