diff options
| author | Winson Chung <winsonc@google.com> | 2012-01-30 12:18:04 -0800 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2012-01-30 17:20:47 -0800 |
| commit | b33e05fa50a0a386e96acf8dc9b5ccd1ba6834ae (patch) | |
| tree | 212ddffa8d892c3884a2854965cfd7e47cc6e503 /src | |
| parent | 63f541d52c7e5abc6a076213f62e806480f2026b (diff) | |
| download | android_packages_apps_Trebuchet-b33e05fa50a0a386e96acf8dc9b5ccd1ba6834ae.tar.gz android_packages_apps_Trebuchet-b33e05fa50a0a386e96acf8dc9b5ccd1ba6834ae.tar.bz2 android_packages_apps_Trebuchet-b33e05fa50a0a386e96acf8dc9b5ccd1ba6834ae.zip | |
Fixing two regressions in which side pages were not drawn or oriented correctly.
Change-Id: Ib936d7701c8962fc04e6fed2e3d624291fe8fc46
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/PagedView.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index afee8b076..7abe6e1d6 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -766,8 +766,8 @@ public abstract class PagedView extends ViewGroup { // View.INVISIBLE, preventing re-drawing of their hardware layer for (int i = getChildCount() - 1; i >= 0; i--) { final View v = getPageAt(i); - if (leftScreen <= i && i <= rightScreen && - v.getAlpha() > ViewConfiguration.ALPHA_THRESHOLD) { + + if (leftScreen <= i && i <= rightScreen) { v.setVisibility(VISIBLE); drawChild(canvas, v, drawingTime); } else { diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 8d11aa71e..4e03b757c 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -1660,7 +1660,7 @@ public class Workspace extends SmoothPagedView rotate.setInterpolator(new DecelerateInterpolator(2.0f)); rotate.addUpdateListener(new LauncherAnimatorUpdateListener() { public void onAnimationUpdate(float a, float b) { - cl.setRotationY(a * 0f + b * 1f); + cl.setRotationY(a * mOldRotationYs[i] + b * mNewRotationYs[i]); } }); anim.play(rotate); |