Fix Edge Navigation gray bitmap position

Sometimes the gray bitmap would be requested for the
wrong page.
This fix ensures that only the last active page will go gray
when sliding.

Change-Id: Ie5380829d5a76c33ad65d6e1e5b0d1ac3ea3b840

1 files changed, 16 insertions, 0 deletions

diff --git a/src/com/android/browser/EdgeSwipeController.java b/src/com/android/browser/EdgeSwipeController.java
index fe991e80..1f7eb488 100644
--- a/src/com/android/browser/EdgeSwipeController.java
+++ b/src/com/android/browser/EdgeSwipeController.java
@@ -216,6 +216,22 @@ public class EdgeSwipeController extends ViewDragHelper.Callback {
 
                         }
                         cancel();
+                    } else if(mState == ViewDragHelper.STATE_DRAGGING) {
+                        if (mGrayBM) {
+                            return;
+                        }
+                        switch (mFromEdge) {
+                            case ViewDragHelper.EDGE_LEFT:
+                                mView.setSlidingViewBitmap(
+                                        getGrayscale(getSnapshotOrFavicon(pageIndex)));
+                                mGrayBM = true;
+                                break;
+                            case ViewDragHelper.EDGE_RIGHT:
+                                mView.setStationaryViewBitmap(
+                                        getGrayscale(getSnapshotOrFavicon(pageIndex)));
+                                mGrayBM = true;
+                                break;
+                        }
                     } else {
                         if (mGrayBM) {
                             return;