summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2011-07-26 17:16:44 -0700
committerAdam Cohen <adamcohen@google.com>2011-07-26 17:19:37 -0700
commit2f84ef259314b0bef20f6e7e503377212fadc88c (patch)
treed13079596dc001f9342e7594ba76eca7e2dd65ce /src
parent81dc59b427587aece75c2318cbcfb6aff070e519 (diff)
downloadandroid_packages_apps_Trebuchet-2f84ef259314b0bef20f6e7e503377212fadc88c.tar.gz
android_packages_apps_Trebuchet-2f84ef259314b0bef20f6e7e503377212fadc88c.tar.bz2
android_packages_apps_Trebuchet-2f84ef259314b0bef20f6e7e503377212fadc88c.zip
Fixing issue 5079169, portal overlays All Apps
Change-Id: Ib5536121d994f2254ae6b41a0cebd2bfca8de115
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/Launcher.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index efdc6b01e..bc341ef81 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1581,6 +1581,9 @@ public final class Launcher extends Activity
* @param v The view representing the clicked shortcut.
*/
public void onClick(View v) {
+ // Make sure that rogue clicks don't get through while allapps is launching
+ if (mWorkspace.isSwitchingState()) return;
+
Object tag = v.getTag();
if (tag instanceof ShortcutInfo) {
// Open shortcut
@@ -2318,6 +2321,7 @@ public final class Launcher extends Activity
// Pause the auto-advance of widgets until we are out of AllApps
mUserPresent = false;
updateRunning();
+ closeFolder();
// Send an accessibility event to announce the context change
getWindow().getDecorView().sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);