summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-06-27 21:50:46 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-27 21:50:46 (GMT)
commit487241fdd71c098695dba07534316d015de08734 (patch)
treee2c6ad745aad19e57596dd9aa997c26b302a1bb6
parentbcff7eda3731b7af254a1d5182766683ea1d46e3 (diff)
parente76e36f420c4e0ff2198eeadc86a3b2acfa2479a (diff)
downloadandroid_packages_apps_Trebuchet-487241fdd71c098695dba07534316d015de08734.zip
android_packages_apps_Trebuchet-487241fdd71c098695dba07534316d015de08734.tar.gz
android_packages_apps_Trebuchet-487241fdd71c098695dba07534316d015de08734.tar.bz2
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.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Cling.java b/src/com/android/launcher2/Cling.java
index c83ee2f..646c54e 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;
};