diff options
| author | Winson Chung <winsonc@google.com> | 2013-11-12 19:37:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-12 19:37:07 +0000 |
| commit | e248b83797e6b6ce128085560ad0c5b900413bf2 (patch) | |
| tree | fd96b33ecd8b00b09903e22e792f12a4180269ee /src/com/android | |
| parent | f0f2ffaedc39b4657a3b7e24a4a3a90e08ed087f (diff) | |
| parent | 8e15fdf60a103391839433ced3c0990d13ba5012 (diff) | |
| download | android_packages_apps_Trebuchet-e248b83797e6b6ce128085560ad0c5b900413bf2.tar.gz android_packages_apps_Trebuchet-e248b83797e6b6ce128085560ad0c5b900413bf2.tar.bz2 android_packages_apps_Trebuchet-e248b83797e6b6ce128085560ad0c5b900413bf2.zip | |
Merge "Prevent launching Widgets when cycling between Overview/Shrink state and Home. (Bug 11439120)" into jb-ub-now-jolly-elf
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 12 |
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()); |