diff options
author | Adam Cohen <adamcohen@google.com> | 2014-11-19 16:03:20 -0800 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2014-11-19 16:24:12 -0800 |
commit | c8f4e1bc88401cad3cc5e439cd08450974d99d81 (patch) | |
tree | 25b8e67b7e3a2a8d2c69571451e7ebbac48dca24 | |
parent | 08072c05bf9c760acff653545a795a0fae4bd917 (diff) | |
download | android_packages_apps_Trebuchet-c8f4e1bc88401cad3cc5e439cd08450974d99d81.tar.gz android_packages_apps_Trebuchet-c8f4e1bc88401cad3cc5e439cd08450974d99d81.tar.bz2 android_packages_apps_Trebuchet-c8f4e1bc88401cad3cc5e439cd08450974d99d81.zip |
Fix a couple regressions from resetting AppsCustomizeTabHost
Bug 18409435
Bug 18358080
Change-Id: I07a071342b5c5e062ab2bb562b672d93ba0d5c2e
4 files changed, 13 insertions, 6 deletions
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java index 8aa013f8b..c8187f068 100644 --- a/src/com/android/launcher3/AppsCustomizePagedView.java +++ b/src/com/android/launcher3/AppsCustomizePagedView.java @@ -839,6 +839,12 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen cancelAllTasks(); } + @Override + public void trimMemory() { + super.trimMemory(); + clearAllWidgetPages(); + } + public void clearAllWidgetPages() { cancelAllTasks(); int count = getChildCount(); @@ -1472,9 +1478,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen } } - @Override public void reset() { - super.reset(); // If we have reset, then we should not continue to restore the previous state mSaveInstanceStateItemIndex = -1; diff --git a/src/com/android/launcher3/AppsCustomizeTabHost.java b/src/com/android/launcher3/AppsCustomizeTabHost.java index 69e3ac17f..a2717126d 100644 --- a/src/com/android/launcher3/AppsCustomizeTabHost.java +++ b/src/com/android/launcher3/AppsCustomizeTabHost.java @@ -118,6 +118,10 @@ public class AppsCustomizeTabHost extends FrameLayout implements LauncherTransit mPagedView.reset(); } + void trimMemory() { + mPagedView.trimMemory(); + } + public void onWindowVisible() { if (getVisibility() == VISIBLE) { mContent.setVisibility(VISIBLE); diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 0d1d3ef6e..ac46fd33d 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3815,10 +3815,9 @@ public class Launcher extends Activity // 3MB of memory for caching which isn't necessary. SQLiteDatabase.releaseMemory(); - // We reset the apps customize tray in order to - // to free all the memory associated with widget previews + // This clears all widget bitmaps from the widget tray if (mAppsCustomizeTabHost != null) { - mAppsCustomizeTabHost.reset(); + mAppsCustomizeTabHost.trimMemory(); } } } diff --git a/src/com/android/launcher3/PagedViewWithDraggableItems.java b/src/com/android/launcher3/PagedViewWithDraggableItems.java index 7f4a3a032..0e593698d 100644 --- a/src/com/android/launcher3/PagedViewWithDraggableItems.java +++ b/src/com/android/launcher3/PagedViewWithDraggableItems.java @@ -91,7 +91,7 @@ public abstract class PagedViewWithDraggableItems extends PagedView return super.onTouchEvent(ev); } - public void reset() { + public void trimMemory() { mLastTouchedItem = null; } |