Merge "Notifying page end transition if forceFinish is called in the middle of page transition" into ub-launcher3-master
diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java
index 90e857c..3e3b3b2 100644
--- a/quickstep/src/com/android/quickstep/RecentsModel.java
+++ b/quickstep/src/com/android/quickstep/RecentsModel.java
@@ -211,13 +211,13 @@
public void onStart() {
mRecentsTaskLoader.startLoader(mContext);
- mRecentsTaskLoader.getHighResThumbnailLoader().setVisible(true);
+// mRecentsTaskLoader.getHighResThumbnailLoader().setVisible(true);
}
public void onTrimMemory(int level) {
if (level == ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN) {
// We already stop the loader in UI_HIDDEN, so stop the high res loader as well
- mRecentsTaskLoader.getHighResThumbnailLoader().setVisible(false);
+// mRecentsTaskLoader.getHighResThumbnailLoader().setVisible(false);
}
mRecentsTaskLoader.onTrimMemory(level);
}
diff --git a/quickstep/src/com/android/quickstep/RecentsView.java b/quickstep/src/com/android/quickstep/RecentsView.java
index 0d9e2a7..9ae41eb 100644
--- a/quickstep/src/com/android/quickstep/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/RecentsView.java
@@ -335,7 +335,7 @@
final Task task = taskView.getTask();
removeView(taskView);
loader.unloadTaskData(task);
- loader.getHighResThumbnailLoader().onTaskInvisible(task);
+// loader.getHighResThumbnailLoader().onTaskInvisible(task);
}
setLayoutTransition(mLayoutTransition);
@@ -463,7 +463,7 @@
// Update the high res thumbnail loader
RecentsTaskLoader loader = mModel.getRecentsTaskLoader();
- loader.getHighResThumbnailLoader().setFlingingFast(isFlingingFast);
+// loader.getHighResThumbnailLoader().setFlingingFast(isFlingingFast);
return scrolling;
}
@@ -508,12 +508,12 @@
if (visible) {
if (!mPrevVisibleTasks.get(i)) {
loader.loadTaskData(task);
- loader.getHighResThumbnailLoader().onTaskVisible(task);
+// loader.getHighResThumbnailLoader().onTaskVisible(task);
}
} else {
if (mPrevVisibleTasks.get(i)) {
loader.unloadTaskData(task);
- loader.getHighResThumbnailLoader().onTaskInvisible(task);
+// loader.getHighResThumbnailLoader().onTaskInvisible(task);
}
}
mPrevVisibleTasks.put(i, visible);