commit 05e3c35dedfd20437aa8b076d352ba4bf72e303b
author Sagar Dhawan <sdhawan@codeaurora.org> Mon Sep 07 15:24:33 2015 +0200
committer jrizzoli <joey@cyanogenmoditalia.it> Thu Nov 05 14:22:56 2015 +0100
tree 130c2bcc6288bc84d7379db46e8d462fd3bdc085
parent ef06f56b0c3b325ead98bee17da44a66bc25ab9e

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

src/com/android/browser/BaseUi.java

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 374bc15..4f7ad3f 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -448,10 +448,13 @@
             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(