Trebuchet: fix expanded desktop with GEL integration

On leaving the GEL activity, we were setting extra flags, which affected
global sensitivity. We actually don't have to do any extra cleanup and
unset any flags, so let's just remove the code!

Change-Id: I111f2e4c62017841e0148f7172ad097e00962385
Signed-off-by: Roman Birg <roman@cyngn.com>

2 files changed, 0 insertions, 19 deletions

diff --git a/src/com/android/launcher3/GelIntegrationHelper.java b/src/com/android/launcher3/GelIntegrationHelper.java
index 4d2c4917b..118be19db 100644
--- a/src/com/android/launcher3/GelIntegrationHelper.java
+++ b/src/com/android/launcher3/GelIntegrationHelper.java
@@ -23,7 +23,6 @@ public class GelIntegrationHelper {
 
     private static final int EDGE_GESTURE_SERVICE_RIGHT_EDGE = 4;
     private static final int EDGE_GESTURE_SERVICE_LEFT_EDGE = 1;
-    private static final int EDGE_GESTURE_SERVICE_NO_EDGE = -1;
 
     private EdgeGestureManager.EdgeGestureActivationListener mEdgeGestureActivationListener = null;
     private static GelIntegrationHelper sInstance;
@@ -98,18 +97,4 @@ public class GelIntegrationHelper {
         return pm.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) != null;
     }
 
-    /**
-     * Handle necessary cleanup and reset tasks for GEL integration, to be called from onResume.
-     */
-    public void handleGelResume() {
-        // If there is an active EdgeGestureActivationListener for GEL integration,
-        // it should stop listening when we have resumed the launcher.
-        if(mEdgeGestureActivationListener != null) {
-            EdgeGestureManager edgeGestureManager = EdgeGestureManager.getInstance();
-            // Update the listener so it is not listening to any postions (-1)
-            edgeGestureManager.updateEdgeGestureActivationListener(mEdgeGestureActivationListener,
-                                                                   EDGE_GESTURE_SERVICE_NO_EDGE);
-        }
-    }
-
 }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 90cf241b4..01e3fc584 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1157,10 +1157,6 @@ public class Launcher extends Activity
 
         updateGridIfNeeded();
 
-        if(isCustomContentModeGel() && isGelIntegrationSupported()) {
-            GelIntegrationHelper.getInstance().handleGelResume();
-        }
-
         // Restore the previous launcher state
         if (mOnResumeState == State.WORKSPACE) {
             showWorkspace(false);