diff options
| author | Adam Powell <adamp@google.com> | 2011-01-21 15:52:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-21 15:52:12 -0800 |
| commit | a4f8e903c3b4be9a840e0495be5bbfdb2a0a21e1 (patch) | |
| tree | 6128965312cd88f4f3855c5136d3b2241fff0505 /core | |
| parent | c971d5ed8e2c8674152f9292a890558535a7268a (diff) | |
| parent | 5fc3c84f5c465d3f0f435037bd5b92fa8da1f2c2 (diff) | |
| download | frameworks_base-a4f8e903c3b4be9a840e0495be5bbfdb2a0a21e1.zip frameworks_base-a4f8e903c3b4be9a840e0495be5bbfdb2a0a21e1.tar.gz frameworks_base-a4f8e903c3b4be9a840e0495be5bbfdb2a0a21e1.tar.bz2 | |
am 5fc3c84f: Merge "Fix bug 3362680 - calendar crash while tabbing among views" into honeycomb
* commit '5fc3c84f5c465d3f0f435037bd5b92fa8da1f2c2':
Fix bug 3362680 - calendar crash while tabbing among views
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/View.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 811a633..b41687e 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -5117,7 +5117,16 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility removeCallbacks(mPendingCheckForLongPress); } } - + + /** + * Remove the pending click action + */ + private void removePerformClickCallback() { + if (mPerformClick != null) { + removeCallbacks(mPerformClick); + } + } + /** * Remove the prepress detection timer. */ @@ -7579,6 +7588,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility removeUnsetPressCallback(); removeLongPressCallback(); + removePerformClickCallback(); destroyDrawingCache(); |