diff options
| author | Sagar Dhawan <sdhawan@codeaurora.org> | 2015-07-08 17:24:44 -0700 |
|---|---|---|
| committer | jrizzoli <joey@cyanogenmoditalia.it> | 2015-08-28 13:15:45 +0200 |
| commit | 33551ffea822cb02d1ad88f5a33e046e98eca43f (patch) | |
| tree | e144564b67c74da90262bcf17ba6e929c4945971 /src/com/android/browser/EdgeSwipeController.java | |
| parent | 5e016c66c673c78e040157f4b691082d180f77e5 (diff) | |
| download | android_packages_apps_Gello-33551ffea822cb02d1ad88f5a33e046e98eca43f.tar.gz android_packages_apps_Gello-33551ffea822cb02d1ad88f5a33e046e98eca43f.tar.bz2 android_packages_apps_Gello-33551ffea822cb02d1ad88f5a33e046e98eca43f.zip | |
Disable Edge Navigation when Keyboard is showing
Change-Id: I4580a3e307c42bed7d163f9c4a25bda91d910106
Diffstat (limited to 'src/com/android/browser/EdgeSwipeController.java')
| -rw-r--r-- | src/com/android/browser/EdgeSwipeController.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/browser/EdgeSwipeController.java b/src/com/android/browser/EdgeSwipeController.java index 87ad2e79..fe991e80 100644 --- a/src/com/android/browser/EdgeSwipeController.java +++ b/src/com/android/browser/EdgeSwipeController.java @@ -459,7 +459,7 @@ public class EdgeSwipeController extends ViewDragHelper.Callback { public void onEdgeTouched (int edgeFlags, int pointerId) { synchronized (this) { - if (mActiveTab.isPrivateBrowsingEnabled()) { + if (mActiveTab.isPrivateBrowsingEnabled() || mActiveTab.isKeyboardShowing()) { mDragHelper.abort(); return; } |