diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index d92f659..cc21920 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -612,10 +612,10 @@
         return new int[]{ padding, padding };
     }
 
-    public boolean shouldIgnoreLongPressToOverview(float touchX, float edgeThreshold) {
+    public boolean shouldIgnoreLongPressToOverview(float touchX) {
         boolean inMultiWindowMode = this != inv.landscapeProfile && this != inv.portraitProfile;
-        boolean touchedLhsEdge = mInsets.left == 0 && touchX < edgeThreshold;
-        boolean touchedRhsEdge = mInsets.right == 0 && touchX > (widthPx - edgeThreshold);
+        boolean touchedLhsEdge = mInsets.left == 0 && touchX < edgeMarginPx;
+        boolean touchedRhsEdge = mInsets.right == 0 && touchX > (widthPx - edgeMarginPx);
         return !inMultiWindowMode && (touchedLhsEdge || touchedRhsEdge);
     }
 }
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 9a42513..0540249 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -316,7 +316,6 @@
     private UserEventDispatcher mUserEventDispatcher;
 
     private float mLastDispatchTouchEventX = 0.0f;
-    private float mEdgeOfScreenThresholdPx = 0.0f;
 
     public ViewGroupFocusHelper mFocusHandler;
     private boolean mRotationEnabled = false;
@@ -395,9 +394,6 @@
 
         setContentView(R.layout.launcher);
 
-        mEdgeOfScreenThresholdPx = getResources()
-                .getDimensionPixelSize(R.dimen.edge_of_screen_threshold);
-
         setupViews();
         mDeviceProfile.layout(this, false /* notifyListeners */);
         mExtractedColors = new ExtractedColors();
@@ -2718,8 +2714,8 @@
         }
 
 
-        boolean ignoreLongPressToOverview = mDeviceProfile.shouldIgnoreLongPressToOverview(
-                mLastDispatchTouchEventX, mEdgeOfScreenThresholdPx);
+        boolean ignoreLongPressToOverview =
+                mDeviceProfile.shouldIgnoreLongPressToOverview(mLastDispatchTouchEventX);
 
         if (v instanceof Workspace) {
             if (!mWorkspace.isInOverviewMode()) {
