diff options
author | Sagar Dhawan <sdhawan@codeaurora.org> | 2015-09-07 15:24:33 +0200 |
---|---|---|
committer | jrizzoli <joey@cyanogenmoditalia.it> | 2015-09-07 15:24:33 +0200 |
commit | 7845952fe9b81d2878b1c21d634004a06d642e26 (patch) | |
tree | d1c6872ddba5fbe2886706541613ad7f40fad1bc | |
parent | 0d5e759e8f102ecdb265c67c380f23322b9a8f05 (diff) | |
download | android_packages_apps_Gello-7845952fe9b81d2878b1c21d634004a06d642e26.tar.gz android_packages_apps_Gello-7845952fe9b81d2878b1c21d634004a06d642e26.tar.bz2 android_packages_apps_Gello-7845952fe9b81d2878b1c21d634004a06d642e26.zip |
Fix Edge Navigation discovery panel
Previously the view was not getting cleaned
up, this could break some browser functionality
Change-Id: Ic29e11316a54a3876feb7752652742c104f277cf
CR-Fixed: 900986
-rw-r--r-- | src/src/com/android/browser/BaseUi.java | 7 | ||||
-rw-r--r-- | src/src/com/android/browser/EdgeSwipeSettings.java | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/src/com/android/browser/BaseUi.java b/src/src/com/android/browser/BaseUi.java index 374bc15b..4f7ad3f8 100644 --- a/src/src/com/android/browser/BaseUi.java +++ b/src/src/com/android/browser/BaseUi.java @@ -448,10 +448,13 @@ public abstract class BaseUi implements UI { mEdgeSwipeController.cleanup(); } - mEdgeSwipeSettings = null; - String action = BrowserSettings.getInstance().getEdgeSwipeAction(); + if (mEdgeSwipeSettings != null) { + mEdgeSwipeSettings.cleanup(); + } + mEdgeSwipeSettings = null; + if (action.equalsIgnoreCase( mActivity.getResources().getString(R.string.value_temporal_edge_swipe))) { mEdgeSwipeController = new EdgeSwipeController( diff --git a/src/src/com/android/browser/EdgeSwipeSettings.java b/src/src/com/android/browser/EdgeSwipeSettings.java index 71c8a565..dd6da872 100644 --- a/src/src/com/android/browser/EdgeSwipeSettings.java +++ b/src/src/com/android/browser/EdgeSwipeSettings.java @@ -182,6 +182,14 @@ public class EdgeSwipeSettings extends ViewDragHelper.Callback { goLive(); } + public void cleanup() { + synchronized (this) { + goLive(); + mModel.cleanup(); + } + } + + private void showCurrBitmap() { if (mStationaryView.getVisibility() == View.VISIBLE) { return; @@ -309,4 +317,3 @@ public class EdgeSwipeSettings extends ViewDragHelper.Callback { return left; } } - |