Fix some drag behavior bugs in keyguard

Integrate from proto app

Make sure you can drag back up immediately without the delay of extra
offset on the challenge view.

There are still a few further tweaks to make here that will be
dependent on another upcoming patch.

Change-Id: I6af599e43d6be6da7b431dca5b87e39c157a54df

Author: adamp

core/res/res/layout-port/keyguard_widget_pager.xml

@@ -25,7 +25,7 @@
     android:paddingLeft="25dp"
     android:paddingRight="25dp"
     android:paddingTop="25dp"
-    android:paddingBottom="64dp"
+    android:paddingBottom="@dimen/kg_widget_pager_bottom_padding"
     android:clipChildren="false"
     android:clipToPadding="false"
     androidprv:pageSpacing="10dp">

core/res/res/values-land/dimens.xml

@@ -50,4 +50,10 @@
     <!-- Space reserved at the bottom of secure views (pin/pattern/password/SIM pin/SIM puk) -->
     <dimen name="kg_secure_padding_height">0dp</dimen>
 
+    <!-- Top padding for the widget pager -->
+    <dimen name="kg_widget_pager_top_padding">0dp</dimen>
+
+    <!-- Bottom padding for the widget pager -->
+    <dimen name="kg_widget_pager_bottom_padding">0dp</dimen>
+
 </resources>

core/res/res/values-sw600dp/dimens.xml

@@ -98,10 +98,10 @@
     <dimen name="kg_widget_pager_horizontal_padding">24dp</dimen>
 
     <!-- Top padding for the widget pager -->
-    <dimen name="kg_widget_pager_top_padding">24dp</dimen>
+    <dimen name="kg_widget_pager_top_padding">0dp</dimen>
 
     <!-- Bottom padding for the widget pager -->
-    <dimen name="kg_widget_pager_bottom_padding">16dp</dimen>
+    <dimen name="kg_widget_pager_bottom_padding">0dp</dimen>
 
     <!-- Top margin for the runway lights. We add a negative margin in large
         devices to account for the widget pager padding -->

core/res/res/values-sw720dp/dimens.xml

@@ -91,10 +91,10 @@
     <dimen name="kg_widget_pager_horizontal_padding">80dp</dimen>
 
     <!-- Top padding for the widget pager -->
-    <dimen name="kg_widget_pager_top_padding">32dp</dimen>
+    <dimen name="kg_widget_pager_top_padding">0dp</dimen>
 
     <!-- Bottom padding for the widget pager -->
-    <dimen name="kg_widget_pager_bottom_padding">36dp</dimen>
+    <dimen name="kg_widget_pager_bottom_padding">0dp</dimen>
 
     <!-- Top margin for the runway lights. We add a negative margin in large
         devices to account for the widget pager padding -->

core/res/res/values/dimens.xml

@@ -294,7 +294,7 @@
     <dimen name="kg_widget_pager_top_padding">0dp</dimen>
 
     <!-- Bottom padding for the widget pager -->
-    <dimen name="kg_widget_pager_bottom_padding">0dp</dimen>
+    <dimen name="kg_widget_pager_bottom_padding">64dp</dimen>
 
     <!-- Top margin for the runway lights. We add a negative margin in large
         devices to account for the widget pager padding -->

policy/src/com/android/internal/policy/impl/keyguard/SlidingChallengeLayout.java

@@ -20,6 +20,7 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.content.Context;
+import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -247,12 +248,12 @@ public SlidingChallengeLayout(Context context, AttributeSet attrs, int defStyle)
         mMinVelocity = vc.getScaledMinimumFlingVelocity();
         mMaxVelocity = vc.getScaledMaximumFlingVelocity();
 
-        mDragHandleEdgeSlop = getResources().getDimensionPixelSize(
-                R.dimen.kg_edge_swipe_region_size);
+        final Resources res = getResources();
+        mDragHandleEdgeSlop = res.getDimensionPixelSize(R.dimen.kg_edge_swipe_region_size);
 
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
 
-        final float density = getResources().getDisplayMetrics().density;
+        final float density = res.getDisplayMetrics().density;
 
         // top half of the lock icon, plus another 25% to be sure
         mDragHandleClosedAbove = (int) (DRAG_HANDLE_CLOSED_ABOVE * density + 0.5f);
@@ -261,7 +262,7 @@ public SlidingChallengeLayout(Context context, AttributeSet attrs, int defStyle)
         mDragHandleOpenBelow = (int) (DRAG_HANDLE_OPEN_BELOW * density + 0.5f);
 
         // how much space to account for in the handle when closed
-        mChallengeBottomBound = mDragHandleClosedBelow;
+        mChallengeBottomBound = res.getDimensionPixelSize(R.dimen.kg_widget_pager_bottom_padding);
 
         setWillNotDraw(false);
     }
@@ -535,6 +536,11 @@ private int getChallengeMargin(boolean expanded) {
         return expanded && mHasGlowpad ? 0 : mDragHandleEdgeSlop;
     }
 
+    private float getChallengeAlpha() {
+        float x = mChallengeOffset - 1;
+        return x * x * x + 1.f;
+    }
+
     @Override
     public void requestDisallowInterceptTouchEvent(boolean allowIntercept) {
         // We'll intercept whoever we feel like! ...as long as it isn't a challenge view.
@@ -570,7 +576,8 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
 
                     if (!mIsBouncing &&
                             (isInDragHandle(x, y) || crossedDragHandle(x, y, mGestureStartY) ||
-                            (isInChallengeView(x, y) && mScrollState == SCROLL_STATE_SETTLING)) &&
+                            (isInChallengeView(x, y) &&
+                                (mScrollState == SCROLL_STATE_SETTLING || !mChallengeShowing))) &&
                             mActivePointerId == INVALID_POINTER) {
                         mActivePointerId = ev.getPointerId(i);
                         mGestureStartX = x;
@@ -860,7 +867,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
                 // we never want less than the handle size showing at the bottom.
                 final int bottom = layoutBottom + (int) ((childHeight - mChallengeBottomBound)
                         * (1 - mChallengeOffset));
-                child.setAlpha(mChallengeOffset / 2 + 0.5f);
+                child.setAlpha(getChallengeAlpha());
                 child.layout(left, bottom - childHeight, left + childWidth, bottom);
             } else {
                 // Non-challenge views lay out from the upper left, layered.
@@ -938,7 +945,7 @@ public void draw(Canvas c) {
             }
 
             if (mDragIconDrawable != null) {
-                final int closedTop = getLayoutBottom() - mChallengeBottomBound;
+                final int closedTop = getLayoutBottom() - mDragHandleClosedBelow;
                 final int iconWidth = mDragIconDrawable.getIntrinsicWidth();
                 final int iconHeight = mDragIconDrawable.getIntrinsicHeight();
                 final int iconLeft = (challengeLeft + challengeRight - iconWidth) / 2;
@@ -996,7 +1003,7 @@ private boolean moveChallengeTo(int bottom) {
         mChallengeView.layout(mChallengeView.getLeft(),
                 bottom - mChallengeView.getHeight(), mChallengeView.getRight(), bottom);
 
-        mChallengeView.setAlpha(offset / 2 + 0.5f);
+        mChallengeView.setAlpha(getChallengeAlpha());
         if (mScrollListener != null) {
             mScrollListener.onScrollPositionChanged(offset, mChallengeView.getTop());
         }