am c38160c8: am 61597bd5: Fix 2271141 - Pressing the bottom corner of the screen when the applications menu is visible will switch the home screen
Merge commit 'c38160c86ba022430cb00e4a1c5555391f9a2ec3' into eclair-mr2-plus-aosp
* commit 'c38160c86ba022430cb00e4a1c5555391f9a2ec3':
Fix 2271141 - Pressing the bottom corner of the screen when the applications menu is visible will
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 859a75e..300b3b9 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -589,12 +589,16 @@
@SuppressWarnings({"UnusedDeclaration"})
public void previousScreen(View v) {
- mWorkspace.scrollLeft();
+ if (!isAllAppsVisible()) {
+ mWorkspace.scrollLeft();
+ }
}
@SuppressWarnings({"UnusedDeclaration"})
public void nextScreen(View v) {
- mWorkspace.scrollRight();
+ if (!isAllAppsVisible()) {
+ mWorkspace.scrollRight();
+ }
}
/**