commit 0fb7db5a3771223bc86fdf0e01665e69c1309cc1
author Adam Cohen <adamcohen@google.com> Wed Sep 29 13:02:43 2010 -0700
committer Adam Cohen <adamcohen@google.com> Wed Sep 29 13:04:32 2010 -0700
tree 032c664a02611f0820e1d85f21d898844c3e812a
parent de7658b5e02ae10010e44fcf8d9c5814f54d9eb0

Fixing boot stall.
Revert "-Added 3D effect to home screen scrolling"

This reverts commit 9415d87eda0cf28b8df1eccde39b0ca1646be3b9.

Change-Id: Ib8d6602f5d82884eb1f6cc44c0cc71cc563a3a59

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 4e47acb..5aec48e 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -78,7 +78,6 @@
     protected final static int TOUCH_STATE_SCROLLING = 1;
     protected final static int TOUCH_STATE_PREV_PAGE = 2;
     protected final static int TOUCH_STATE_NEXT_PAGE = 3;
-    protected final static float ALPHA_QUANTIZE_LEVEL = 0.01f;
 
     protected int mTouchState = TOUCH_STATE_REST;
 
@@ -368,6 +367,7 @@
             if (mDirtyPageAlpha || (mTouchState == TOUCH_STATE_SCROLLING) || !mScroller.isFinished()) {
                 int halfScreenSize = getMeasuredWidth() / 2;
                 int screenCenter = mScrollX + halfScreenSize;
+
                 final int childCount = getChildCount();
                 for (int i = 0; i < childCount; ++i) {
                     View layout = (View) getChildAt(i);
@@ -391,12 +391,6 @@
                     dimAlpha = Math.max(0.0f, Math.min(1.0f, (dimAlpha * dimAlpha)));
                     float alpha = 1.0f - dimAlpha;
 
-                    if (alpha < ALPHA_QUANTIZE_LEVEL) {
-                        alpha = 0.0f;
-                    } else if (alpha > 1.0f - ALPHA_QUANTIZE_LEVEL) {
-                        alpha = 1.0f;
-                    }
-
                     if (Float.compare(alpha, layout.getAlpha()) != 0) {
                         layout.setAlpha(alpha);
                     }
@@ -406,16 +400,10 @@
         }
     }
 
-    protected void screenScrolled(int screenCenter) {
-    }
-
     @Override
     protected void dispatchDraw(Canvas canvas) {
         updateAdjacentPagesAlpha();
 
-        int halfScreenSize = getMeasuredWidth() / 2;
-        int screenCenter = mScrollX + halfScreenSize;
-        screenScrolled(screenCenter);
         // Find out which screens are visible; as an optimization we only call draw on them
         // As an optimization, this code assumes that all pages have the same width as the 0th
         // page.