diff options
author | Winson Chung <winsonc@google.com> | 2012-06-27 14:53:14 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-27 14:53:14 -0700 |
commit | dab9b114039198add72105dcb3015d1765b2af9f (patch) | |
tree | 4d5d5ae4be7dca6477a5b37d5c476b355e911a1d /src/com/android/launcher2/Cling.java | |
parent | 087f7a64bce5c7b5868d4cc22a369ccfe6d3fc1f (diff) | |
parent | 487241fdd71c098695dba07534316d015de08734 (diff) | |
download | android_packages_apps_Trebuchet-dab9b114039198add72105dcb3015d1765b2af9f.tar.gz android_packages_apps_Trebuchet-dab9b114039198add72105dcb3015d1765b2af9f.tar.bz2 android_packages_apps_Trebuchet-dab9b114039198add72105dcb3015d1765b2af9f.zip |
am 487241fd: am e76e36f4: Merge "Disallowing touches through the custom workspace cling. (Bug 6721250)" into jb-dev
* commit '487241fdd71c098695dba07534316d015de08734':
Disallowing touches through the custom workspace cling. (Bug 6721250)
Diffstat (limited to 'src/com/android/launcher2/Cling.java')
-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 33cb26f0a..971d9ff53 100644 --- a/src/com/android/launcher2/Cling.java +++ b/src/com/android/launcher2/Cling.java @@ -187,9 +187,6 @@ public class Cling extends FrameLayout { return false; } } - } else if (mDrawIdentifier.equals(WORKSPACE_CUSTOM)) { - // Let all touch events fall through - return false; } return true; }; |