Fixing some regressions in tablet reordering/deleting.

Change-Id: Ib3e48fa2606c0259603f6daf3b2ef72e1c8e292d

Author: Winson Chung

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

@@ -58,6 +58,13 @@ public boolean isChallengeShowing() {
         return false;
     }
 
+    public boolean isChallengeOverlapping() {
+        if (mChallengeLayout != null) {
+            return mChallengeLayout.isChallengeOverlapping();
+        }
+        return false;
+    }
+
     public void setSecurityViewContainer(KeyguardSecurityView container) {
         mKeyguardSecurityContainer = container;
     }

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

@@ -589,7 +589,9 @@ public float getChildrenOutlineAlpha() {
     @Override
     public boolean onLongClick(View v) {
         // Disallow long pressing to reorder if the challenge is showing
-        if (!mViewStateManager.isChallengeShowing() && startReordering()) {
+        boolean isChallengeOverlapping = mViewStateManager.isChallengeShowing() &&
+                mViewStateManager.isChallengeOverlapping();
+        if (!isChallengeOverlapping && startReordering()) {
             return true;
         }
         return false;

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

@@ -2072,15 +2072,15 @@ void endReordering() {
 
         // If we haven't flung-to-delete the current child, then we just animate the drag view
         // back into position
+        final Runnable onCompleteRunnable = new Runnable() {
+            @Override
+            public void run() {
+                onEndReordering();
+            }
+        };
         if (!mIsFlingingToDelete) {
             mPostReorderingPreZoomInRunnable = new Runnable() {
                 public void run() {
-                    Runnable onCompleteRunnable = new Runnable() {
-                        @Override
-                        public void run() {
-                            onEndReordering();
-                        }
-                    };
                     zoomIn(onCompleteRunnable);
                 };
             };
@@ -2091,6 +2091,8 @@ public void run() {
             snapToPage(indexOfChild(mDragView), 0);
             // Animate the drag view back to the front position
             animateDragViewToOriginalPosition();
+        } else {
+            zoomIn(onCompleteRunnable);
         }
     }