Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev

Author: Adam Cohen

core/res/res/drawable-hdpi/security_frame.9.png

@@ -1234,7 +1234,7 @@
   <java-symbol type="drawable" name="magnified_region_frame" />
   <java-symbol type="drawable" name="menu_background" />
   <java-symbol type="drawable" name="stat_sys_secure" />
-  <java-symbol type="drawable" name="security_frame" />
+  <java-symbol type="drawable" name="kg_bouncer_bg_white" />
   <java-symbol type="id" name="action_mode_bar_stub" />
   <java-symbol type="id" name="alarm_status" />
   <java-symbol type="id" name="backspace" />

core/res/res/drawable-hdpi/security_handle.png

@@ -17,12 +17,14 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.View;
 
 import com.android.internal.R;
 
 public class KeyguardWidgetCarousel extends KeyguardWidgetPager {
 
     private float mAdjacentPagesAngle;
+    private static float MAX_SCROLL_PROGRESS = 1.3f;
     private static float CAMERA_DISTANCE = 10000;
 
     public KeyguardWidgetCarousel(Context context, AttributeSet attrs) {
@@ -39,43 +41,73 @@ public KeyguardWidgetCarousel(Context context, AttributeSet attrs, int defStyle)
     }
 
     protected float getMaxScrollProgress() {
-        return 1.5f;
+        return MAX_SCROLL_PROGRESS;
+    }
+
+    public float getAlphaForPage(int screenCenter, int index) {
+        View child = getChildAt(index);
+        if (child == null) return 0f;
+
+        float scrollProgress = getScrollProgress(screenCenter, child, index);
+        if (!isOverScrollChild(index, scrollProgress)) {
+            scrollProgress = getBoundedScrollProgress(screenCenter, child, index);
+            float alpha = 1 - Math.abs(scrollProgress / MAX_SCROLL_PROGRESS);
+            return alpha;
+        } else {
+            return 1f;
+        }
     }
 
     private void updatePageAlphaValues(int screenCenter) {
-        boolean isInOverscroll = mOverScrollX < 0 || mOverScrollX > mMaxScrollX;
-        if (!isInOverscroll) {
+        if (mChildrenOutlineFadeAnimation != null) {
+            mChildrenOutlineFadeAnimation.cancel();
+            mChildrenOutlineFadeAnimation = null;
+        }
+        if (!isReordering(false)) {
             for (int i = 0; i < getChildCount(); i++) {
                 KeyguardWidgetFrame child = getWidgetPageAt(i);
                 if (child != null) {
-                    float scrollProgress = getScrollProgress(screenCenter, child, i);
-                    if (!isReordering(false)) {
-                        child.setBackgroundAlphaMultiplier(
-                                backgroundAlphaInterpolator(Math.abs(scrollProgress)));
-                    } else {
-                        child.setBackgroundAlphaMultiplier(1f);
-                    }
+                    float alpha = getAlphaForPage(screenCenter, i);
+                    child.setBackgroundAlpha(alpha);
+                    child.setContentAlpha(alpha);
                 }
             }
         }
+
     }
 
     @Override
     protected void screenScrolled(int screenCenter) {
+        mScreenCenter = screenCenter;
         updatePageAlphaValues(screenCenter);
         for (int i = 0; i < getChildCount(); i++) {
             KeyguardWidgetFrame v = getWidgetPageAt(i);
-            if (v == mDragView) continue;
-            if (v != null) {
-                float scrollProgress = getScrollProgress(screenCenter, v, i);
+            float scrollProgress = getScrollProgress(screenCenter, v, i);
+            if (v == mDragView || v == null) continue;
+            v.setCameraDistance(CAMERA_DISTANCE);
+
+            if (isOverScrollChild(i, scrollProgress)) {
+                v.setRotationY(- OVERSCROLL_MAX_ROTATION * scrollProgress);
+                v.setOverScrollAmount(Math.abs(scrollProgress), scrollProgress < 0);
+            } else {
+                scrollProgress = getBoundedScrollProgress(screenCenter, v, i);
                 int width = v.getMeasuredWidth();
                 float pivotX = (width / 2f) + scrollProgress * (width / 2f);
                 float pivotY = v.getMeasuredHeight() / 2;
                 float rotationY = - mAdjacentPagesAngle * scrollProgress;
-                v.setCameraDistance(CAMERA_DISTANCE);
                 v.setPivotX(pivotX);
                 v.setPivotY(pivotY);
                 v.setRotationY(rotationY);
+                v.setOverScrollAmount(0f, false);
+            }
+
+            float alpha = v.getAlpha();
+            // If the view has 0 alpha, we set it to be invisible so as to prevent
+            // it from accepting touches
+            if (alpha == 0) {
+                v.setVisibility(INVISIBLE);
+            } else if (v.getVisibility() != VISIBLE) {
+                v.setVisibility(VISIBLE);
             }
         }
     }

core/res/res/drawable-mdpi/security_frame.9.png

@@ -51,6 +51,7 @@ public class KeyguardWidgetFrame extends FrameLayout {
     private CheckLongPressHelper mLongPressHelper;
 
     private float mBackgroundAlpha;
+    private float mContentAlpha;
     private float mBackgroundAlphaMultiplier = 1.0f;
     private Drawable mBackgroundDrawable;
     private Rect mBackgroundRect = new Rect();
@@ -74,7 +75,7 @@ public KeyguardWidgetFrame(Context context, AttributeSet attrs, int defStyle) {
         int padding = (int) (res.getDisplayMetrics().density * 8);
         setPadding(padding, padding, padding, padding);
 
-        mBackgroundDrawable = res.getDrawable(R.drawable.security_frame);
+        mBackgroundDrawable = res.getDrawable(R.drawable.kg_bouncer_bg_white);
         mGradientColor = res.getColor(com.android.internal.R.color.kg_widget_pager_gradient);
         mGradientPaint.setXfermode(sAddBlendMode);
     }
@@ -133,6 +134,23 @@ public void cancelLongPress() {
         mLongPressHelper.cancelLongPress();
     }
 
+
+    private void drawGradientOverlay(Canvas c) {
+        mGradientPaint.setShader(mForegroundGradient);
+        mGradientPaint.setAlpha(mForegroundAlpha);
+        c.drawRect(mForegroundRect, mGradientPaint);
+    }
+
+    protected void drawBg(Canvas canvas) {
+        if (mBackgroundAlpha > 0.0f) {
+            Drawable bg = mBackgroundDrawable;
+
+            bg.setAlpha((int) (mBackgroundAlpha * mBackgroundAlphaMultiplier * 255));
+            bg.setBounds(mBackgroundRect);
+            bg.draw(canvas);
+        }
+    }
+
     @Override
     protected void dispatchDraw(Canvas canvas) {
         drawBg(canvas);
@@ -164,6 +182,14 @@ public void disableHardwareLayersForContent() {
         }
     }
 
+    public void enableHardwareLayers() {
+        setLayerType(LAYER_TYPE_HARDWARE, null);
+    }
+
+    public void disableHardwareLayers() {
+        setLayerType(LAYER_TYPE_NONE, null);
+    }
+
     public View getContent() {
         return getChildAt(0);
     }
@@ -177,28 +203,12 @@ public int getContentAppWidgetId() {
         }
     }
 
-    private void drawGradientOverlay(Canvas c) {
-        mGradientPaint.setShader(mForegroundGradient);
-        mGradientPaint.setAlpha(mForegroundAlpha);
-        c.drawRect(mForegroundRect, mGradientPaint);
-    }
-
-    protected void drawBg(Canvas canvas) {
-        if (mBackgroundAlpha > 0.0f) {
-            Drawable bg = mBackgroundDrawable;
-
-            bg.setAlpha((int) (mBackgroundAlpha * mBackgroundAlphaMultiplier * 255));
-            bg.setBounds(mBackgroundRect);
-            bg.draw(canvas);
-        }
-    }
-
     public float getBackgroundAlpha() {
         return mBackgroundAlpha;
     }
 
     public void setBackgroundAlphaMultiplier(float multiplier) {
-        if (mBackgroundAlphaMultiplier != multiplier) {
+        if (Float.compare(mBackgroundAlphaMultiplier, multiplier) != 0) {
             mBackgroundAlphaMultiplier = multiplier;
             invalidate();
         }
@@ -209,13 +219,18 @@ public float getBackgroundAlphaMultiplier() {
     }
 
     public void setBackgroundAlpha(float alpha) {
-        if (mBackgroundAlpha != alpha) {
+        if (Float.compare(mBackgroundAlpha, alpha) != 0) {
             mBackgroundAlpha = alpha;
             invalidate();
         }
     }
 
+    public float getContentAlpha() {
+        return mContentAlpha;
+    }
+
     public void setContentAlpha(float alpha) {
+        mContentAlpha = alpha;
         View content = getContent();
         if (content != null) {
             content.setAlpha(alpha);