summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aospGilles Debunne2011-03-141-15/+16
|\
| * Double tap on a word no longer opens context menu. DO NOT MERGEGilles Debunne2011-02-141-14/+16
* | am 2050de5b: Text selection is broken.Gilles Debunne2011-02-091-6/+6
|\|
| * Text selection is broken.Gilles Debunne2011-02-091-6/+6
* | am cdfe8999: Fix for multiple merge problem.Gilles Debunne2011-02-081-3/+1
|\|
| * Fix for multiple merge problem.Gilles Debunne2011-02-041-3/+1
* | resolved conflicts for merge of c0728cc0 to gingerbread-plus-aospGilles Debunne2011-02-081-17/+40
|\|
| * Double tap triggers text selection in a TextView. DO NOT MERGEGilles Debunne2011-02-041-17/+40
* | am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO...Gilles Debunne2011-02-041-2/+2
|\|
| * Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." ...Gilles Debunne2011-02-041-2/+2
| |\
| | * Blinking runnable is created only if text is editable. DO NOT MERGE.Gilles Debunne2011-01-111-2/+2
* | | am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into g...Gilles Debunne2011-02-041-3/+32
|\| |
| * | Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbreadGilles Debunne2011-02-041-3/+32
| |\ \
| | * | All runnable are stopped on detach. DO NOT MERGE.Gilles Debunne2011-01-111-3/+32
| | |/
* | | am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." ...Gilles Debunne2011-02-041-58/+36
|\| |
| * | SelectAllOnFocus shows a higlighted text. DO NOT MERGE.Gilles Debunne2011-01-121-58/+36
| |/
* | Fix typo in manual mergeAdam Powell2010-11-081-1/+1
* | resolved conflicts for merge of 06fd1dc5 to gingerbread-plus-aospAdam Powell2010-11-081-30/+99
|\|
| * DO NOT MERGE Fix bug 3121030 - Text handles erroneously appear overAdam Powell2010-11-081-29/+98
* | am 3073646f: Merge "Update insertion handler for WebTextView." into gingerbreadLeon Scroggins2010-11-011-0/+9
|\|
| * Update insertion handler for WebTextView.Leon Scroggins2010-11-011-0/+9
* | resolved conflicts for merge of 5d919b43 to gingerbread-plus-aospJean-Baptiste Queru2010-10-201-2/+19
|\ \
| * | Make disabled TextViews uneditableJanos Levai2010-10-181-2/+19
* | | am 3d01cb93: Merge "Removed "Select word" option on password fields." into gi...Gilles Debunne2010-10-181-4/+28
|\ \ \ | | |/ | |/|
| * | Removed "Select word" option on password fields.Gilles Debunne2010-10-151-4/+28
* | | am 53ea7f58: Merge "Really leave text selection mode when using the trackball...Gilles Debunne2010-10-141-0/+1
|\| |
| * | Really leave text selection mode when using the trackball.Gilles Debunne2010-10-131-0/+1
* | | am fb6431c0: Merge "Fix bug 3064135 - do not allow text handles on TextViews ...Adam Powell2010-10-121-2/+12
|\| |
| * | Fix bug 3064135 - do not allow text handles on TextViews in sub windows.Adam Powell2010-10-121-2/+12
* | | am b72a335a: Merge "Voice input replaces selected text." into gingerbreadGilles Debunne2010-10-101-13/+10
|\| |
| * | Voice input replaces selected text.Gilles Debunne2010-10-101-13/+10
* | | am a827d7bc: Merge "Other improvements to text cursor movement." into gingerb...Gilles Debunne2010-10-081-13/+24
|\| |
| * | Other improvements to text cursor movement.Gilles Debunne2010-10-081-13/+24
* | | am 50662f5f: Merge "TextView cursor and selection improvements." into gingerb...Gilles Debunne2010-10-081-28/+37
|\| |
| * | TextView cursor and selection improvements.Gilles Debunne2010-10-081-28/+37
* | | am 56e9b8eb: Merge "Long press with trackball selects word under cursor." int...Gilles Debunne2010-10-081-13/+23
|\| |
| * | Long press with trackball selects word under cursor.Gilles Debunne2010-10-071-13/+23
* | | am 3ecceb5b: Merge "TextView refactoring to ease future merges in HC." into g...Gilles Debunne2010-10-071-43/+64
|\| |
| * | TextView refactoring to ease future merges in HC.Gilles Debunne2010-10-071-43/+64
* | | am f15dfbec: Merge "Fix bug 3071869 - text anchors are now treated as applica...Adam Powell2010-10-071-0/+2
|\| |
| * | Fix bug 3071869 - text anchors are now treated as application sub-panels.Adam Powell2010-10-071-0/+2
* | | am fbb3b476: Fix bug 3066313 - integrate new text anchor assets.Adam Powell2010-10-071-51/+93
|\| |
| * | Fix bug 3066313 - integrate new text anchor assets.Adam Powell2010-10-061-51/+93
* | | am 671b2a57: Merge "Fix for IndexOutOfBounds in text pasting." into gingerbreadGilles Debunne2010-10-051-4/+11
|\| |
| * | Fix for IndexOutOfBounds in text pasting.Gilles Debunne2010-10-051-4/+11
* | | am abcbb1a1: Fix bug 3061544 and some clipping errors.Adam Powell2010-10-041-16/+59
|\| |
| * | Fix bug 3061544 and some clipping errors.Adam Powell2010-10-041-16/+59
* | | am a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces betwee...Gilles Debunne2010-10-041-44/+1
|\| |
| * | DO NOT MERGE. Select word no longer selects spaces between words.Gilles Debunne2010-10-041-44/+1
* | | am 4d3baaf5: Merge "Bug fixes in Text selection." into gingerbreadGilles Debunne2010-10-041-26/+11
|\| |