summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/TextView.java
Commit message (Expand)AuthorAgeFilesLines
* am 0235016a: am 2df13452: Merge "Insert into user dict with the correct local...Gilles Debunne2011-12-071-0/+1
|\
| * Insert into user dict with the correct localeJean Chalard2011-12-071-0/+1
* | resolved conflicts for merge of fb729202 to masterGilles Debunne2011-12-061-33/+40
|\ \ | |/
| * Merge "Invalidated bounds tightened in TextView" into ics-mr1Gilles Debunne2011-12-061-33/+40
| |\
| | * Invalidated bounds tightened in TextViewGilles Debunne2011-11-291-33/+40
* | | am b4812f8a: am 335c4e6c: Broken build. New methods made private.Gilles Debunne2011-12-011-2/+2
|\ \ \ | |/ /
| * | Broken build. New methods made private.Gilles Debunne2011-12-011-2/+2
| * | Merge "Scroll performance improved in multiline TextEdit" into ics-mr1Gilles Debunne2011-12-011-0/+11
| |\ \
| | * | Scroll performance improved in multiline TextEditGilles Debunne2011-11-291-0/+11
| | |/
* | | am a8205d24: am 09cbff02: Merge "Better handles\' visibility test" into ics-mr1Gilles Debunne2011-12-011-30/+48
|\ \ \ | |/ /
| * | Merge "Better handles' visibility test" into ics-mr1Gilles Debunne2011-12-011-30/+48
| |\ \
| | * | Better handles' visibility testGilles Debunne2011-12-011-30/+48
| | |/
* | | am 4fec974c: am 0433c157: Merge "TextViews keep focus after Done" into ics-mr1Gilles Debunne2011-12-011-3/+2
|\ \ \ | |/ /
| * | TextViews keep focus after DoneGilles Debunne2011-11-301-3/+2
* | | am d732efa2: am b2aa672f: Merge "Revert "IME action (done, next...) correctly...Gilles Debunne2011-12-011-3/+1
|\ \ \ | |/ /
| * | Revert "IME action (done, next...) correctly handled"Gilles Debunne2011-11-301-3/+1
| |/
* | Merge "Restoring mLayout has private in TextView"Gilles Debunne2011-11-291-7/+1
|\ \
| * | Restoring mLayout has private in TextViewGilles Debunne2011-11-281-7/+1
* | | am 9d8d5297: am 10232fe6: Merge "Extracted text problems" into ics-mr1Gilles Debunne2011-11-291-23/+35
|\ \ \ | | |/ | |/|
| * | Merge "Extracted text problems" into ics-mr1Gilles Debunne2011-11-291-23/+35
| |\ \
| | * | Extracted text problemsGilles Debunne2011-11-101-25/+35
* | | | am 0dca407e: am 7be31bd9: Merge "IOOB in text selection." into ics-mr1Gilles Debunne2011-11-291-11/+9
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge "IOOB in text selection." into ics-mr1Gilles Debunne2011-11-291-11/+9
| |\ \
| | * | IOOB in text selection.Gilles Debunne2011-11-201-11/+9
* | | | am b3272d29: am de8c5ec8: Merge "IME action (done, next...) correctly handled...Gilles Debunne2011-11-171-1/+3
|\ \ \ \ | |/ / /
| * | | Merge "IME action (done, next...) correctly handled" into ics-mr1Gilles Debunne2011-11-161-1/+3
| |\ \ \
| | * | | IME action (done, next...) correctly handledGilles Debunne2011-11-161-1/+3
| | |/ /
* | | | am 7bc6600e: am 8a440477: Merge "Clean-up in TextView" into ics-mr1Gilles Debunne2011-11-151-28/+3
|\ \ \ \ | |/ / /
| * | | Merge "Clean-up in TextView" into ics-mr1Gilles Debunne2011-11-151-28/+3
| |\ \ \ | | |/ / | |/| |
| | * | Clean-up in TextViewGilles Debunne2011-11-101-28/+3
* | | | Merge "Seems to break text views all over. Particularly noticeable is that t...Jeff Brown2011-11-111-7/+5
|\ \ \ \
| * | | | Seems to break text views all over. Particularly noticeable is that the labe...Jeff Brown2011-11-111-7/+5
* | | | | am 9acae658: am 847fbbea: Merge "Localized optimizations in views and bitmaps...Christopher Tate2011-11-111-5/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Localized optimizations in views and bitmapsChristopher Tate2011-11-111-5/+7
| | |/ / | |/| |
* | | | am 2e97db49: am e5504ba1: Merge "Visual glitches when starting extracted text...Gilles Debunne2011-11-101-14/+22
|\ \ \ \ | |/ / /
| * | | Merge "Visual glitches when starting extracted text" into ics-mr1Gilles Debunne2011-11-101-14/+22
| |\ \ \
| | * | | Visual glitches when starting extracted textGilles Debunne2011-11-091-14/+22
| | | |/ | | |/|
* | | | am 3628dafe: am 34bd5969: Merge "Respect user settings for spell checking lan...satok2011-11-101-13/+12
|\ \ \ \ | |/ / /
| * | | Respect user settings for spell checking language if explicitly setsatok2011-11-101-13/+12
| |/ /
* | | Fix bug #5544127 TextView regression in ICS when setting TextSize dynamicallyFabrice Di Meglio2011-11-091-0/+2
* | | Merge "Fix bug #5387832 [UI/Visual] Address of the website is not displayed p...Fabrice Di Meglio2011-11-081-5/+7
|\ \ \ | | |/ | |/|
| * | Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly...Fabrice Di Meglio2011-10-241-5/+7
* | | am 39896f52: Merge "No more context menu in TextView" into ics-mr1Gilles Debunne2011-11-081-79/+2
|\ \ \ | | |/ | |/|
| * | No more context menu in TextViewGilles Debunne2011-11-041-79/+2
* | | am ad41a94b: Merge "Some optimizations." into ics-mr1Dianne Hackborn2011-11-021-6/+6
|\ \ \ | |/ /
| * | Some optimizations.Dianne Hackborn2011-11-011-6/+6
| * | am 4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0Gilles Debunne2011-10-281-4/+5
| |\ \
| | * | Text handles do not handle scroll correctlyGilles Debunne2011-10-281-4/+5
| | * | Bug 5428541: Check that span is still in text before deletingGilles Debunne2011-10-201-6/+8
* | | | No threading issues in SpellChecker.Gilles Debunne2011-10-311-0/+1