commit 72f2a7af828056fc426d936c1d40cb6bbdbdf7c7
author Michael Jurka <mikejurka@google.com> Mon May 06 11:42:22 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 06 11:42:24 2013 +0000
tree 0e3f68894a2dd86ece573dd1cd67a1046155d1bd
parent 236cc476e6792a11502ba4f40c7ab4586f40d282
parent 45eed3c69b718fe5dedaff0322e2ed4c2f55b9d3

Merge "Fix bug where thumbnails in Recents disappear" into jb-mr2-dev

packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java

diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java b/packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java
index 9281c75..02ddb73 100644
--- a/packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java
+++ b/packages/SystemUI/src/com/android/systemui/recent/RecentTasksLoader.java
@@ -286,6 +286,10 @@
 
 
     private void cancelLoadingThumbnailsAndIcons() {
+        if (mRecentsPanel != null && mRecentsPanel.isShowing()) {
+            return;
+        }
+
         if (mTaskLoader != null) {
             mTaskLoader.cancel(false);
             mTaskLoader = null;

packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java

diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java
index c325937..62030ad 100644
--- a/packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java
@@ -127,6 +127,9 @@
         }
         mShowing = true;
         if (mRecentsPanel != null) {
+            // Call and refresh the recent tasks list in case we didn't preload tasks
+            // or in case we don't get an onNewIntent
+            mRecentsPanel.refreshRecentTasksList();
             mRecentsPanel.refreshViews();
         }
         super.onStart();