Commit Graph

210 Commits

Author SHA1 Message Date
Jeff Brown
464fb74e28 am 9785bf0f: am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread
Merge commit '9785bf0f2b6b8758aed7ded3b996a2ef0be89919'

* commit '9785bf0f2b6b8758aed7ded3b996a2ef0be89919':
  Add suuport for splitting touch events across windows.
2010-09-27 14:40:38 -07:00
Jeff Brown
9785bf0f2b am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread
Merge commit '14a288da6a372230d9af41da12241fe500eec837' into gingerbread-plus-aosp

* commit '14a288da6a372230d9af41da12241fe500eec837':
  Add suuport for splitting touch events across windows.
2010-09-27 12:37:03 -07:00
Jeff Brown
01ce2e9eee Add suuport for splitting touch events across windows.
This feature is currently used to enable dragging the start and end
selection handles of a TextView at the same time.  Could be used for
other things later.

Deleted some dead code in ArrowKeyMovementMethod and CursorControllers.

Change-Id: I930accd97ca1ca1917aab8a807db2c950fc7b409
2010-09-26 22:20:12 -07:00
Adam Powell
879fb6b5d6 Text selection anchors changed to use windows
Manually cherry-picked

Change-Id: Id080dfad0e2f324fef3a5175abc78f76c8bad4c8
2010-09-21 17:56:48 -07:00
Adam Powell
770a681b2f am 9aed3002: Text selection anchors changed to use windows
Merge commit '9aed300279db6953356aed5ef24a42291f5829cb' into gingerbread-plus-aosp

* commit '9aed300279db6953356aed5ef24a42291f5829cb':
  Text selection anchors changed to use windows
2010-09-21 17:20:40 -07:00
Adam Powell
9aed300279 Text selection anchors changed to use windows
Change-Id: I14f138039f5e3175a8c07f21985715b8447708e5
2010-09-21 17:11:41 -07:00
Brad Fitzpatrick
42a5ed2015 resolved conflicts for merge of 171c83f4 to master
Change-Id: I56a4c1838b17cf40d96763f95df3c84fc86359eb
2010-09-12 13:55:18 -07:00
Brad Fitzpatrick
171c83f47d am 11fe181e: Add faster TextUtil function for searching delimited lists.
Merge commit '11fe181e16501103d7c0f70344661ea2ef5d3df9' into gingerbread-plus-aosp

* commit '11fe181e16501103d7c0f70344661ea2ef5d3df9':
  Add faster TextUtil function for searching delimited lists.
2010-09-12 11:03:48 -07:00
Brad Fitzpatrick
11fe181e16 Add faster TextUtil function for searching delimited lists.
The previous version in Settings allocated memory.

Change-Id: I0f821112dc8f830689489f201ce268195f9e6cbd
2010-09-12 10:58:38 -07:00
Gilles Debunne
fd1a8945be am de5cfcb6: am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Merge commit 'de5cfcb608f3432d98ae17e0febb6e726df79e90'

* commit 'de5cfcb608f3432d98ae17e0febb6e726df79e90':
  Fix for a memory leak in TextKeyListener.
2010-09-08 15:50:50 -07:00
Gilles Debunne
de5cfcb608 am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Merge commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050' into gingerbread-plus-aosp

* commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050':
  Fix for a memory leak in TextKeyListener.
2010-09-08 15:02:20 -07:00
Gilles Debunne
d35180cf52 Fix for a memory leak in TextKeyListener.
Open source contribution https://review.source.android.com/#change,16985

Change-Id: Iebf09e147dd26575ca1a3f02180a678583671a68
2010-09-08 11:26:55 -07:00
Erik
d41b037c6b am c4f628a1: am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Merge commit 'c4f628a1ba359926cf53ed7652d9abba6ea29123'

* commit 'c4f628a1ba359926cf53ed7652d9abba6ea29123':
  Adds a time zone parameter to formatDateRange
2010-09-08 11:04:41 -07:00
Erik
c4f628a1ba am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Merge commit 'c0b4f6d30d962d75125628317b5f5ea622531dfe' into gingerbread-plus-aosp

* commit 'c0b4f6d30d962d75125628317b5f5ea622531dfe':
  Adds a time zone parameter to formatDateRange
2010-09-08 11:01:27 -07:00
Erik
577ec9eb3a Adds a time zone parameter to formatDateRange
For a critical feature request in Calendar we need the ability
to format a date range in a time zone other than the local tz.
This adds a new method signature to formatDateRange to allow for
a tz to be specified and maintains the old behavior if the parameter
is not used. Also deprecates the FORMAT_UTC flag.

Change-Id: I16b3e939760ec86c954b51a318d01b7bbf86acc9
2010-09-08 10:53:40 -07:00
Gilles Debunne
5c69544826 am cf86bc1d: am 883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread
Merge commit 'cf86bc1d92128455c06ed8b0a338e7b3145d11a7'

* commit 'cf86bc1d92128455c06ed8b0a338e7b3145d11a7':
  Hide mCursorController field in ArrowKeyMovementMethod.
2010-09-07 19:05:18 -07:00
Gilles Debunne
cf86bc1d92 am 883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread
Merge commit '883bbb72284736b5601f9e96d1116969c51b75de' into gingerbread-plus-aosp

* commit '883bbb72284736b5601f9e96d1116969c51b75de':
  Hide mCursorController field in ArrowKeyMovementMethod.
2010-09-07 18:59:22 -07:00
Gilles Debunne
49271c941e Hide mCursorController field in ArrowKeyMovementMethod.
Made the field private and added a description of its use.

Bug http://b/issue?id=2975284

Change-Id: Id8acf756218915cb2ae756789b62cfe7201a5c67
2010-09-07 18:32:28 -07:00
Jean-Baptiste Queru
9773cd73b6 am f470ed86: Merge "Support surrogate pairs when layouting text"
Merge commit 'f470ed8630e9e648727443b065b9f1c69fee34d6' into gingerbread-plus-aosp

* commit 'f470ed8630e9e648727443b065b9f1c69fee34d6':
  Support surrogate pairs when layouting text
2010-08-30 13:20:41 -07:00
Takako Ishibashi
12122bf792 Support surrogate pairs when layouting text
The current framework does not consider surrogate pairs
when getting the index of the character. This bug becomes
visible when creating the text including Emojis. For
example cursor breaks up when it moves around the Emojis.

Our proposed solution will consider the surrogate pairs
when calculating the index. It will fix not only the Emoji
case, but also the letters that use surrogate pairs.

Change-Id: I4983f2e4df933c8af9d5f0cc27df871e8e10fed4
2010-08-26 08:15:47 +02:00
Chet Haase
673e42fafd Fix for end events from Sequencer objects
Change-Id: I8947d8b016b880f9f54f2bf6ab22b4e188cdb29a
2010-08-25 17:32:27 -07:00
Gilles Debunne
925f2f9096 resolved conflicts for merge of 9765b2a0 to master
Change-Id: Ic37a443fff0425e9d7c8395f71665d56c38d7e53
2010-08-24 15:14:12 -07:00
Kenny Root
8db59adccf resolved conflicts for merge of b037da40 to master
Change-Id: I591f80f613870a4b1557f17d1c8574f661ed8121
2010-08-24 11:48:37 -07:00
Gilles Debunne
9765b2a01d am 2703a42d: When an EditText gains focus by tapping, move the insertion point where tapped.
Merge commit '2703a42d16af0e62da1bba02b6c935d98debf936' into gingerbread-plus-aosp

* commit '2703a42d16af0e62da1bba02b6c935d98debf936':
  When an EditText gains focus by tapping, move the insertion point where tapped.
2010-08-24 10:30:09 -07:00
Gilles Debunne
2703a42d16 When an EditText gains focus by tapping, move the insertion point where tapped.
The previous behavior was to move cursor at the end of the first line,
which feels weird.

Change-Id: I5a72f9871ed79ee2c521698ea642ba126537f4f9
2010-08-24 10:18:31 -07:00
Gilles Debunne
b037da401a am 3e05a0be: Hysteresis effect in Text selection.
Merge commit '3e05a0beb2fad0b21558019d2adf6805da70e10e' into gingerbread-plus-aosp

* commit '3e05a0beb2fad0b21558019d2adf6805da70e10e':
  Hysteresis effect in Text selection.
2010-08-23 15:26:51 -07:00
Gilles Debunne
3e05a0beb2 Hysteresis effect in Text selection.
Vertical movement requires going over a given threshold to change line.
Makes it easier to move down without changing line, so that one can see the
cursor better. Also simplifies long line selection.

Change-Id: I791da500232c6e510af64c637ed994c5da9a4fea
2010-08-23 15:20:53 -07:00
Gilles Debunne
a842d143d2 am d018a0ce: Merge "Text selection without trackball." into gingerbread
Merge commit 'd018a0ce72124f668d859b19fe3e73f5637d3c7c' into gingerbread-plus-aosp

* commit 'd018a0ce72124f668d859b19fe3e73f5637d3c7c':
  Text selection without trackball.
2010-08-19 18:01:20 -07:00
Gilles Debunne
b0d6ba1ec4 Text selection without trackball.
Backported from HC.

Squashed commit of the following:

commit af214a595c7a9fdd11a2dc384f7d4665abf751c0
    Fixes in TextView's selection.

commit eb9fd59ebe6500a66c2003d46b5802299970ae8d
    TextView with Selection Contextual Mode

commit 4c4c338ef355b369ce4b57d6c6fba7ee8f9dddf4
    Cosmetic changes around TextView.

commit d4b4b054e87480d984ad18766f5e76553e3080d8
    Double and one and a half tap removed from TextView.

commit 897c2847ba1fca8ef01eadadd1bc3de007af3ee5
    Selection handlers in TextView

commit 832be74a5394649e28927484d9a86c6d53b430e7
    New cursor controller in TextViews.

Change-Id: I01cc64736e2abea605317ee53907a1713617fc17
2010-08-19 15:55:02 -07:00
Romain Guy
c4d8eb6fb7 Speedup TextView fades (no more layers required.)
Also fixes a crash in the drop shadows cache and improves
drop shadows caching.

Change-Id: I9c0208a49467f9201d786ae0c129194b8d423923
2010-08-18 20:48:33 -07:00
Eric Fischer
74d31ef2b2 Fix a bug where paragraph styles could leak onto an adjacent empty line.
When the text ends with an empty line, the getSpans() call to retrieve
styles for it would also retrieve the styles of the preceding line.
Add a special case to detect and prevent this.

Change-Id: I888131cacce6bf45e68c53c931ebe8d58db0b7a9
2010-08-05 15:29:36 -07:00
Dianne Hackborn
9f53119b72 First pass at a new clipboard API.
ClipboardManager was in android.text(!!) so it needed to be moved
up to android.content to have access to the richer data types we
now need.

ClippedData is the data representation.  Still needs a lot of
fleshing out to allow holding more than one data type at a time
and perhaps conversions between them.  (MIME-oriented interrogation
and conversion will be done through ContentProvider, which needs
to grow an ability to report multiple MIME types and accept a
desired MIME type when a stream is being opened.)

Change-Id: Ifa51bedcd084a677813b255d171804e8496b0cb5
2010-08-05 12:28:20 -07:00
Gilles Debunne
8bfc798dc2 Merge "Cosmetic changes around TextView." 2010-07-13 15:58:43 -07:00
Gilles Debunne
d11f6e6460 Double and one and a half tap removed from TextView.
Text selection is now triggered by a long press. This behavior should be shared
across applications and is already implemented in the browser.

New UI guidelines say that double tap should be used for zooming only.

Change-Id: I9fae692cf3f6e565350f666fa3d5a86884439349
2010-07-13 15:10:08 -07:00
Gilles Debunne
2d0e87b644 Cosmetic changes around TextView.
Fixed some warnings in the code.

Change-Id: Id19395031a1ab41edcc47e3dc8cd9479c6e19f83
2010-07-13 15:07:39 -07:00
Gilles Debunne
05336274dd Selection handlers in TextView
Long press on text view triggers selection mode. Two handles can be used to
adjust selection.

Change-Id: I45bb5fd62cae910570cff34920e45c4383160179
2010-07-12 18:45:40 -07:00
The Android Open Source Project
2f42aa54b4 am 6fb70b5a: merge from open-source master
Merge commit '6fb70b5a9f41f198ee4bc1ed3efeca6f8ccdc5d9'

* commit '6fb70b5a9f41f198ee4bc1ed3efeca6f8ccdc5d9':
  Documentation Bug (Issue 9557)
2010-07-12 15:24:45 -07:00
Gilles Debunne
cc3ec6cdb2 New cursor controller in TextViews.
Editable TextView now display a cursor controller under the insertion
point so that it can be precisely moved.

Change-Id: Ia2e6ddc57d249647ff6683e10e4226db3df27223
2010-07-09 16:20:21 -07:00
Christian Mehlmauer
0df10e9b4e Documentation Bug (Issue 9557)
There was an issue in the Time.toMillis example.
Also removed some whitespaces so the file
applies to the Android coding Styleguide

Change-Id: Ic1383e506b30ff181c6e14a12f675b52e5c8ccbc
2010-07-06 20:42:22 +02:00
Gilles Debunne
312cd58039 Fixed bug in getTextRunCursor.
When auto-correction is used, the text is modified to underline the corrected word, which
modifies mGapLength and mGapStart. The mGapLength shift was not properly handled in getTextRunCursor.

Bug 2807595

Change-Id: I43ee216f6780270e452aa9199ffd892fe7ab6c3f
2010-07-02 22:01:44 -07:00
The Android Open Source Project
74c95d4d41 am 8b0d5bc3: merge from froyo-plus-aosp
Merge commit '8b0d5bc3f858ae2b737ac654fa05c439344ad631'

* commit '8b0d5bc3f858ae2b737ac654fa05c439344ad631':
  Fixing counting the number of days in call log screen.
2010-06-25 14:22:25 -07:00
Kenny Root
24ca4545f3 Check for spanned before computing tab stops
Don't try to check for tab stop spans in non-Spanned text input.

Change-Id: I54d69c8e0246f5a38d0713a89b8b455a478285f0
2010-06-22 23:55:15 -07:00
The Android Open Source Project
f1f33c4eb2 merge from open-source master
Change-Id: If7ae0c5629d1b3c540cacfa517425c2e6b5822d1
2010-06-18 12:46:16 -07:00
Gilles Debunne
345cb03315 Index out of range problem in TextLine.
Recent refactoring for bidi introduced an index shift in the getOffsetBeforeAfter
method. This problem appears for multi-line text input only, when the text line
mStart index is not 0.

As a result, moving the cursor using the trackball in a multi-line EditText crashes.

Change-Id: I1f121f0f9272ef7d338399f369ba6d77e1ca71c5
2010-06-16 17:24:51 -07:00
Jean-Baptiste Queru
6b9a1a5124 Merge "Fixing counting the number of days in call log screen." 2010-06-15 15:11:34 -07:00
Doug Felt
0c702b88c5 Move shaping to native.
Add internal API (getTextRunAdvances) to Paint, use when measuring.
Add internal API (getTextRunCursor) to Paint, use when determining
valid cursor positions.

Remove java-level shaping code.  Remove 'prep' code in TextLine
(except for replacement text) since shaping now is done on the fly as
needed in native.

Provide explicit shaping context bounds to internal text measuring,
cursor movement, and rendering APIs.

Update for to changes in external API in ushape.h.

Change-Id: I146958b624802ce8553125e5c3c6c03031bc9608
2010-06-10 14:03:22 -07:00
Kenny Root
c4a1a927a8 Merge "Fix alignment issues with RTL paragraphs." 2010-06-03 18:26:55 -07:00
Doug Felt
c982f60e98 Fix alignment issues with RTL paragraphs.
Also remove unused debugging code that depends on junit.
Remove trailing whitespace in changed code.

Change-Id: Ie02d1b8220c599a672ee6e91af0fba634e0f620c
2010-06-03 13:33:00 -07:00
The Android Open Source Project
4f2cf8af55 am 913dbc50: am a9f06fef: am ee7e6a78: merge from open-source master 2010-06-03 09:12:40 -07:00
The Android Open Source Project
ee7e6a78e2 merge from open-source master
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
2010-06-03 09:03:58 -07:00