diff options
| author | Craig Mautner <cmautner@google.com> | 2012-03-23 16:20:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-23 16:20:47 -0700 |
| commit | d5f2374e13a7bcefbc7252b814d128794f22af93 (patch) | |
| tree | 0dcfde0da6a47ebf42cffe9c2c192fb6947630f6 /packages | |
| parent | 9321ad6a7567a28116f15240688d474993539922 (diff) | |
| parent | bb1449b392b4fb14f17fa747c2261d7195405df3 (diff) | |
| download | frameworks_base-d5f2374e13a7bcefbc7252b814d128794f22af93.zip frameworks_base-d5f2374e13a7bcefbc7252b814d128794f22af93.tar.gz frameworks_base-d5f2374e13a7bcefbc7252b814d128794f22af93.tar.bz2 | |
Merge "Reset layout needed at each animation step."
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java index 5f314d6..564b07b 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java @@ -616,10 +616,11 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener if (!mFirstScreenful && tasks.size() == 0) { return; } - mNumItemsWaitingForThumbnailsAndIcons = - mFirstScreenful ? tasks.size() : mRecentTaskDescriptions.size(); + mNumItemsWaitingForThumbnailsAndIcons = mFirstScreenful + ? tasks.size() : mRecentTaskDescriptions == null + ? 0 : mRecentTaskDescriptions.size(); if (mRecentTaskDescriptions == null) { - mRecentTaskDescriptions = new ArrayList(tasks); + mRecentTaskDescriptions = new ArrayList<TaskDescription>(tasks); } else { mRecentTaskDescriptions.addAll(tasks); } |