commit c8f4e1bc88401cad3cc5e439cd08450974d99d81
author Adam Cohen <adamcohen@google.com> Wed Nov 19 16:03:20 2014 -0800
committer Adam Cohen <adamcohen@google.com> Wed Nov 19 16:24:12 2014 -0800
tree 25b8e67b7e3a2a8d2c69571451e7ebbac48dca24
parent 08072c05bf9c760acff653545a795a0fae4bd917

Fix a couple regressions from resetting AppsCustomizeTabHost

Bug 18409435
Bug 18358080

Change-Id: I07a071342b5c5e062ab2bb562b672d93ba0d5c2e

src/com/android/launcher3/AppsCustomizePagedView.java

diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index 8aa013f..c8187f0 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -839,6 +839,12 @@
         cancelAllTasks();
     }
 
+    @Override
+    public void trimMemory() {
+        super.trimMemory();
+        clearAllWidgetPages();
+    }
+
     public void clearAllWidgetPages() {
         cancelAllTasks();
         int count = getChildCount();
@@ -1472,9 +1478,7 @@
         }
     }
 
-    @Override
     public void reset() {
-        super.reset();
         // If we have reset, then we should not continue to restore the previous state
         mSaveInstanceStateItemIndex = -1;