Fix edge navigation page dimming

Stationary views are correctly dimmed when using
edge navigation.
Page will no longer flash when partial swiping from
left and then swiping from the right.

Change-Id: I4fd83793840330707cfd97a978c77294dab4b197

1 files changed, 3 insertions, 9 deletions

diff --git a/src/com/android/browser/EdgeSwipeController.java b/src/com/android/browser/EdgeSwipeController.java
index 1f7eb488..5e82ff67 100644
--- a/src/com/android/browser/EdgeSwipeController.java
+++ b/src/com/android/browser/EdgeSwipeController.java
@@ -321,11 +321,11 @@ public class EdgeSwipeController extends ViewDragHelper.Callback {
 
             if (mbNavigated) {
                 mView.setStationaryViewBitmap(getSnapshotOrFavicon(mCurrIndex));
-                mView.setStationaryViewAlpha(1.0f);
             } else {
                 swipeSessionCleanup();
             }
 
+            mView.setStationaryViewAlpha(1.0f);
             mView.invalidate();
 
             setState(ViewDragHelper.STATE_SETTLING, ViewDragHelper.STATE_IDLE);
@@ -387,6 +387,7 @@ public class EdgeSwipeController extends ViewDragHelper.Callback {
                     if (mView.isLive()) {
                         return;
                     }
+                    mView.setStationaryViewAlpha(mMinAlpha + alpha * (1 - mMinAlpha));
 
                     if (mState != ViewDragHelper.STATE_IDLE) {
                         mView.moveShadowView(left);
@@ -398,13 +399,10 @@ public class EdgeSwipeController extends ViewDragHelper.Callback {
                         if (!mView.stationaryViewHasImage()) {
                             mView.setStationaryViewBitmap(getSnapshotOrFavicon(mPrevIndex));
                         }
-
-                        if (mActiveTab.getWebView().canGoToHistoryIndex(mPrevIndex)) {
-                            mView.setStationaryViewAlpha(mMinAlpha + alpha * (1 - mMinAlpha));
-                        }
                     }
                     break;
                 case ViewDragHelper.EDGE_RIGHT:
+                    mView.setStationaryViewAlpha(mMinAlpha + (1 - alpha) * (1 - mMinAlpha));
                     if (mState != ViewDragHelper.STATE_IDLE) {
                         mView.moveShadowView(mView.getMeasuredWidth() + left);
 
@@ -417,10 +415,6 @@ public class EdgeSwipeController extends ViewDragHelper.Callback {
                             mView.goDormant();
                         }
                     }
-                    if (mNextIndex < mMaxIndex &&
-                            mActiveTab.getWebView().canGoToHistoryIndex(mNextIndex)) {
-                        mView.setStationaryViewAlpha(mMinAlpha + (1 - alpha) * (1 - mMinAlpha));
-                    }
                     break;
                 default:
                     break;