From b72094fe1da249cc16af517d5ef598b3cbcbdf11 Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Wed, 14 Sep 2011 14:53:19 -0700 Subject: [PATCH] Disable tap to switch pages on phones Change-Id: I15b911c2785df5aa124814c6128523042104b4da --- src/com/android/launcher2/Workspace.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 6f952fa8d3..5ca25534b7 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -512,7 +512,10 @@ public class Workspace extends SmoothPagedView // mNextPage is set to INVALID_PAGE whenever we are stationary. // Calculating "next page" this way ensures that you scroll to whatever page you tap on final int current = (mNextPage == INVALID_PAGE) ? mCurrentPage : mNextPage; - return hitsPage(current - 1, x, y); + + // Only allow tap to next page on large devices, where there's significant margin outside + // the active workspace + return LauncherApplication.isScreenLarge() && hitsPage(current - 1, x, y); } @Override @@ -520,7 +523,10 @@ public class Workspace extends SmoothPagedView // mNextPage is set to INVALID_PAGE whenever we are stationary. // Calculating "next page" this way ensures that you scroll to whatever page you tap on final int current = (mNextPage == INVALID_PAGE) ? mCurrentPage : mNextPage; - return hitsPage(current + 1, x, y); + + // Only allow tap to next page on large devices, where there's significant margin outside + // the active workspace + return LauncherApplication.isScreenLarge() && hitsPage(current + 1, x, y); } /**