summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/PagedView.java
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2011-12-07 14:00:02 -0800
committerMichael Jurka <mikejurka@google.com>2011-12-12 15:30:58 -0800
commit2a4b1a809c6bc0af9ae3ad974fe50e2a91569543 (patch)
treebb2b0f63d043da08147a5ffe59d3c13344b1dc20 /src/com/android/launcher2/PagedView.java
parentc02e3932c382a1854ff39c5e2714d5c07c0a8bcd (diff)
downloadandroid_packages_apps_Trebuchet-2a4b1a809c6bc0af9ae3ad974fe50e2a91569543.tar.gz
android_packages_apps_Trebuchet-2a4b1a809c6bc0af9ae3ad974fe50e2a91569543.tar.bz2
android_packages_apps_Trebuchet-2a4b1a809c6bc0af9ae3ad974fe50e2a91569543.zip
Make All Apps<-->Workspace transition smoother
- grouping workspace/all apps anims into one animator set, prevents blip when one of them ends early and its end anim handler does lots of work mid-animation - updating pivots for all apps zoom if layout changes - avoid running unnecessary animations on workspace pages - prevent unnecessary reloading of pages in All Apps Change-Id: I53a75f7c4c7d254057e2f8f4fd17711e8862256d
Diffstat (limited to 'src/com/android/launcher2/PagedView.java')
-rw-r--r--src/com/android/launcher2/PagedView.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 2db03da19..975686e49 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -1603,9 +1603,7 @@ public abstract class PagedView extends ViewGroup {
// First, clear any pages that should no longer be loaded
for (int i = 0; i < count; ++i) {
Page layout = (Page) getPageAt(i);
- if ((immediateAndOnly && i != page) ||
- (i < lowerPageBound) ||
- (i > upperPageBound)) {
+ if ((i < lowerPageBound) || (i > upperPageBound)) {
if (layout.getPageChildCount() > 0) {
layout.removeAllViewsOnPage();
}
@@ -1617,7 +1615,6 @@ public abstract class PagedView extends ViewGroup {
if ((i != page) && immediateAndOnly) {
continue;
}
- Page layout = (Page) getPageAt(i);
if (lowerPageBound <= i && i <= upperPageBound) {
if (mDirtyPageContent.get(i)) {
syncPageItems(i, (i == page) && immediateAndOnly);