From: Adam Cohen <adamcohen@google.com>
Date: Thu, 10 Oct 2013 19:48:52 +0000 (-0700)
Subject: Provide final callbacks before remove CustomContent (issue 11169651)
X-Git-Tag: android-x86-6.0-r1~634^2~84^2~35
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bb6fda6ac3c4246b91cf66b28cdbc89c3d8a3e52;p=android-x86%2Fpackages-apps-Launcher3.git

Provide final callbacks before remove CustomContent (issue 11169651)

Change-Id: I0c30d58a4380f4525dcabf54a0cabf3789031ba6
---

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 7a1647413..bbe09463a 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -557,6 +557,12 @@ public class Workspace extends SmoothPagedView
         mWorkspaceScreens.remove(CUSTOM_CONTENT_SCREEN_ID);
         mScreenOrder.remove(CUSTOM_CONTENT_SCREEN_ID);
         removeView(customScreen);
+
+        if (mCustomContentCallbacks != null) {
+            mCustomContentCallbacks.onScrollProgressChanged(0);
+            mCustomContentCallbacks.onHide();
+        }
+
         mCustomContentCallbacks = null;
 
         // Ensure that the current page and default page are maintained.