From 8e15fdf60a103391839433ced3c0990d13ba5012 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 11 Nov 2013 15:47:45 -0800 Subject: [PATCH] Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug 11439120) Change-Id: I21173f114228ba43172af9074d2ac1fadeee9886 --- src/com/android/launcher3/Launcher.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index ba334e304c..0c14ed93ce 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());