commit ae43d147901d1642dcdb1f6928b02978074ff353
author android-build-team Robot <android-build-team-robot@google.com> Mon May 07 18:45:06 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 07 18:45:06 2018 +0000
tree df90863ca9666182e0ac6e8fac3fd4a9a4d9f5d8
parent 76a2a6ae661813b33cce25fc0e129b8f0d03348a
parent db1903a567bfc29bf689ff1216329d5ab6c39252

Merge "Removing extra accessibility box from Recents" into ub-launcher3-edmonton

quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java b/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
index 4ba9e02..730984c 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationWrapper.java
@@ -58,6 +58,7 @@
                     if (onFinishComplete != null) {
                         onFinishComplete.run();
                     }
+                    controller = null;
                 }
             }
         });

quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java

diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index 9dae9df..614ba6e 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -677,6 +677,7 @@
 
         mActivityInitListener.unregister();
         mInputConsumer.unregisterInputConsumer();
+        mTaskSnapshot = null;
     }
 
     private void invalidateHandlerWithLauncher() {

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index b5a603e..bd7e6eb 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -517,6 +517,7 @@
         }
 
         // Remove the pages and clear the screen models
+        removeFolderListeners();
         removeAllViews();
         mScreenOrder.clear();
         mWorkspaceScreens.clear();