diff options
author | Craig Mautner <cmautner@google.com> | 2012-03-23 16:11:14 -0700 |
---|---|---|
committer | Craig Mautner <cmautner@google.com> | 2012-03-23 16:11:14 -0700 |
commit | bb1449b392b4fb14f17fa747c2261d7195405df3 (patch) | |
tree | 4650ad11d3c2e94aa07979a55374d3eabd869467 /packages | |
parent | 764983d16925daeeba3f29fd1f844187655d1386 (diff) | |
download | frameworks_base-bb1449b392b4fb14f17fa747c2261d7195405df3.zip frameworks_base-bb1449b392b4fb14f17fa747c2261d7195405df3.tar.gz frameworks_base-bb1449b392b4fb14f17fa747c2261d7195405df3.tar.bz2 |
Reset layout needed at each animation step.
The member variable WindowAnimator.mPendingLayoutChanges was never
being reset to 0. Consequently once it was set it was causing endless
calls to the layout method.
Fixes bug 6208114, 6220403, 6219546.
Fixed NPE in RecentsPanelView.
Change-Id: Ie529b8f31e535543cb5ae0af9447146306b14eeb
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 66cb32c..4d5c342 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java @@ -615,10 +615,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); } |