summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Launcher.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r--src/com/android/launcher3/Launcher.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index ba334e304..0c14ed93c 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1191,7 +1191,9 @@ public class Launcher extends Activity
widgetButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
- showAllApps(true, AppsCustomizePagedView.ContentType.Widgets, true);
+ if (!mWorkspace.isSwitchingState()) {
+ showAllApps(true, AppsCustomizePagedView.ContentType.Widgets, true);
+ }
}
});
widgetButton.setOnTouchListener(getHapticFeedbackTouchListener());
@@ -1200,7 +1202,9 @@ public class Launcher extends Activity
wallpaperButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
- startWallpaper();
+ if (!mWorkspace.isSwitchingState()) {
+ startWallpaper();
+ }
}
});
wallpaperButton.setOnTouchListener(getHapticFeedbackTouchListener());
@@ -1209,7 +1213,9 @@ public class Launcher extends Activity
settingsButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
- startSettings();
+ if (!mWorkspace.isSwitchingState()) {
+ startSettings();
+ }
}
});
settingsButton.setOnTouchListener(getHapticFeedbackTouchListener());