diff options
author | Winson Chung <winsonc@google.com> | 2012-06-27 14:50:46 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-27 14:50:46 -0700 |
commit | 487241fdd71c098695dba07534316d015de08734 (patch) | |
tree | e2c6ad745aad19e57596dd9aa997c26b302a1bb6 | |
parent | bcff7eda3731b7af254a1d5182766683ea1d46e3 (diff) | |
parent | e76e36f420c4e0ff2198eeadc86a3b2acfa2479a (diff) | |
download | android_packages_apps_Trebuchet-487241fdd71c098695dba07534316d015de08734.tar.gz android_packages_apps_Trebuchet-487241fdd71c098695dba07534316d015de08734.tar.bz2 android_packages_apps_Trebuchet-487241fdd71c098695dba07534316d015de08734.zip |
am e76e36f4: Merge "Disallowing touches through the custom workspace cling. (Bug 6721250)" into jb-dev
* commit 'e76e36f420c4e0ff2198eeadc86a3b2acfa2479a':
Disallowing touches through the custom workspace cling. (Bug 6721250)
-rw-r--r-- | src/com/android/launcher2/Cling.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Cling.java b/src/com/android/launcher2/Cling.java index c83ee2fde..646c54e90 100644 --- a/src/com/android/launcher2/Cling.java +++ b/src/com/android/launcher2/Cling.java @@ -194,9 +194,6 @@ public class Cling extends FrameLayout { return false; } } - } else if (mDrawIdentifier.equals(WORKSPACE_CUSTOM)) { - // Let all touch events fall through - return false; } return true; }; |