diff options
| author | Gilles Debunne <debunne@google.com> | 2011-01-25 14:20:09 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-25 14:20:09 -0800 |
| commit | 47fc854ae9947e0fe5ca0e33e22a41618ba7523b (patch) | |
| tree | 19114bcf94cf7f32c8bdd726c9ef2666e5525bb3 /core/java/android | |
| parent | 4426f643ec3833e830bc2f9b8af5088343de1315 (diff) | |
| parent | d9ed795ca51c57427ad27f246d5ec19f89ff508d (diff) | |
| download | frameworks_base-47fc854ae9947e0fe5ca0e33e22a41618ba7523b.zip frameworks_base-47fc854ae9947e0fe5ca0e33e22a41618ba7523b.tar.gz frameworks_base-47fc854ae9947e0fe5ca0e33e22a41618ba7523b.tar.bz2 | |
Merge "Fix for a call to startActivity from outside of an app." into honeycomb
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/text/method/LinkMovementMethod.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/text/method/LinkMovementMethod.java b/core/java/android/text/method/LinkMovementMethod.java index 9e73371..aff233d 100644 --- a/core/java/android/text/method/LinkMovementMethod.java +++ b/core/java/android/text/method/LinkMovementMethod.java @@ -42,9 +42,9 @@ public class LinkMovementMethod extends ScrollingMovementMethod { case KeyEvent.KEYCODE_DPAD_CENTER: case KeyEvent.KEYCODE_ENTER: if (KeyEvent.metaStateHasNoModifiers(movementMetaState)) { - if (event.getAction() == KeyEvent.ACTION_DOWN - && event.getRepeatCount() == 0) { - return action(CLICK, widget, buffer); + if (event.getAction() == KeyEvent.ACTION_DOWN && + event.getRepeatCount() == 0 && action(CLICK, widget, buffer)) { + return true; } } break; |