summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-11-20 00:03:20 (GMT)
committerDanesh M <daneshm90@gmail.com>2015-09-28 04:07:23 (GMT)
commit918dcfa0de0bc541afa0d865824d68d4ec07a4fb (patch)
tree870992c8988fcdb5fc5fb78253793aca504f420e
parent2fa2db1e8c2c963d917f0563d7961f45e57ab8aa (diff)
downloadandroid_packages_apps_Trebuchet-918dcfa0de0bc541afa0d865824d68d4ec07a4fb.zip
android_packages_apps_Trebuchet-918dcfa0de0bc541afa0d865824d68d4ec07a4fb.tar.gz
android_packages_apps_Trebuchet-918dcfa0de0bc541afa0d865824d68d4ec07a4fb.tar.bz2
Fix a couple regressions from resetting AppsCustomizeTabHost
Bug 18409435 Bug 18358080 Change-Id: I07a071342b5c5e062ab2bb562b672d93ba0d5c2e
-rw-r--r--src/com/android/launcher3/AppsCustomizePagedView.java7
-rw-r--r--src/com/android/launcher3/AppsCustomizeTabHost.java4
-rw-r--r--src/com/android/launcher3/Launcher.java5
-rw-r--r--src/com/android/launcher3/PagedViewWithDraggableItems.java2
4 files changed, 13 insertions, 5 deletions
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index 8c6d117..044dea0 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -987,6 +987,12 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
cancelAllTasks();
}
+ @Override
+ public void trimMemory() {
+ super.trimMemory();
+ clearAllWidgetPages();
+ }
+
public void clearAllWidgetPages() {
cancelAllTasks();
int count = getChildCount();
@@ -1921,7 +1927,6 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
}
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 69e3ac1..a271712 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 44124f9..f98051d 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4414,10 +4414,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 7f4a3a0..0e59369 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;
}