Svetoslav Ganov
47730f1582
am 33a3b2ce: am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
...
* commit '33a3b2cecf174cb14097498214131fcfb32ec04c':
NumberPicker getting stuck if scroll wheel not wrapable.
2011-12-09 18:09:16 -08:00
Gilles Debunne
70511ade47
am b25d417f: am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1
...
* commit 'b25d417fce0e0467187ac187a4dabae75d5dc83d':
Make the Next key navigate between TextViews
2011-12-09 18:09:03 -08:00
Gilles Debunne
2afcfa4239
resolved conflicts for merge of 5371a165 to master
...
Change-Id: I61830ec96c277ebba9db3e40842597b9c98d53c7
2011-12-09 18:06:34 -08:00
Nick Pelly
1db7a31a45
Merge "Add BluetoothAdapter.getRemoteDevice(byte[])"
2011-12-09 14:37:05 -08:00
Nick Pelly
75596b4545
Add BluetoothAdapter.getRemoteDevice(byte[])
...
This is useful for NFC->BT hand-over, where we are already working with bytes.
Change-Id: I2fff0b4fa0cefe9bfdf9a13f7ec6f557776a8a03
2011-12-09 14:35:38 -08:00
Gilles Debunne
683a485fbc
am aee940df: am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1
...
* commit 'aee940df55b5d1f769f56ff8a6dd645253b7f8e5':
IOOB is Suggestions
2011-12-09 14:25:55 -08:00
Gilles Debunne
47a4b78eb7
am 9f4b70c7: am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1
...
* commit '9f4b70c72508077f39a71bb17df265eb883c7a20':
Prevent NPE in SuggestionSpan
2011-12-09 14:25:53 -08:00
Jeff Brown
bdc18b28eb
am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
...
* commit '03e634270d880407316b51fac2278e604fc82703':
Shortcut keys should be handled on down, not up.
2011-12-09 14:25:41 -08:00
Romain Guy
3f7be830f0
Merge "Enable dirty regions on newly created EGL surfaces"
2011-12-09 12:28:46 -08:00
Romain Guy
9477c6e658
Enable dirty regions on newly created EGL surfaces
...
This change fixes an issue on some tiler architectures that do not
enable the swap buffer behavior by default on EGL surfaces.
Change-Id: Ibda1ae582da1a20afad3be9c3361080e72df5206
2011-12-09 12:27:21 -08:00
Gilles Debunne
affde42dbc
am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1
...
* commit 'caf4ead320499cc9a7a2e3eb17beaaf92b391212':
Blinking cursor in Talk
2011-12-09 09:36:07 -08:00
Narayan Kamath
e61fd281a8
Merge "Remove BlockingMediaPlayer."
2011-12-09 06:30:14 -08:00
Gilles Debunne
17994a1d04
Blinking cursor in Talk
...
I verified that this fixes the unblinking cursor problem in Talk.
Change-Id: I5e3e5c8ad5cf3d8479462495107bf93e5e4fb956
2011-12-08 18:40:27 -08:00
Gilles Debunne
8b2edee867
am be5f49fb: Performance improvements for long text edition.
...
* commit 'be5f49fb6e17e0b9588d3b94022b7e3eb6d47317':
Performance improvements for long text edition.
2011-12-08 18:35:29 -08:00
Gilles Debunne
be5f49fb6e
Performance improvements for long text edition.
...
Limit each parse to batches of a few words, to keep the UI thread
responsive.
Possible optimizations for the future:
- SpellCheck in a thread, but that requires some locking mecanism
- Only spell check what is visible on screen. Will require additional
spans to tag the pieces of text.
This is a cherry pick of 145656 into ICS-MR1
Patch Set 2: Make the Runnable shared and stop it when detached.
Change-Id: Ibf8e98274bda84b7176aac181ff267fc1f1fa4cb
2011-12-08 18:26:49 -08:00
Gilles Debunne
6be4695e9d
am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
...
* commit 'df3722895172e03c81787f62d922daabaad3e20b':
Fixed SpellCheckerSessions leak in TextView
2011-12-08 18:20:01 -08:00
Gilles Debunne
df37228951
Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
2011-12-08 18:18:25 -08:00
Gilles Debunne
ddd526e9dc
am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1
...
* commit '316ca5059ebd7270a04da5649d25653c355e158d':
Re-use SpanSets in TextLine
2011-12-08 18:00:19 -08:00
Gilles Debunne
316ca5059e
Merge "Re-use SpanSets in TextLine" into ics-mr1
2011-12-08 17:58:24 -08:00
Joe Malin
58adcd55f4
am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
...
* commit '556e4ca54161be17333ec98fadc113485120a6e8':
DOC CHANGE: Package text and Formatter javadoc
2011-12-08 17:46:50 -08:00
Joe Malin
556e4ca541
am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
...
* commit '0a9005ed58d3a6173e8fffbd72933f7646c6fdba':
DOC CHANGE: Package text and Formatter javadoc
2011-12-08 17:44:34 -08:00
Joe Malin
0a9005ed58
Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
2011-12-08 17:42:36 -08:00
Mangesh Ghiware
66b2ff818b
Update computation of reading level scale.
...
Fixes bug 5726043 (Extra double-tap needed to zoom out to overview mode
on nytimes.com on a Stingray)
Change-Id: I54dc303f4aa81ddc38c234228adc915b9f6749dc
2011-12-08 17:11:16 -08:00
Amith Yamasani
8df9609768
Show the current stream's volume in the volume panel.
...
Bug: 5409969
If the current stream being displayed is different from the
stream being adjusted, rearrange the sliders, unless multiple
sliders are being shown.
Change-Id: Ia48986c1046305d7fee7a32177d78d8ffd84a11b
2011-12-08 17:03:54 -08:00
Gilles Debunne
c1f4483080
Re-use SpanSets in TextLine
...
TextLine objects are already stored in a pool to limit allocation.
Associate SpanSet objects to each TextLine to further limit the
allocation of these and re-use their internal arrays (re-sized if needed).
Drastically reduces new objects allocation during rendering.
Priority code removed in init: priorities are already handled by getSpans.
This is a duplicate of the already accepted
https://android-git.corp.google.com/g/#/c/153970/
but without the dependency on an other CL.
Change-Id: Iaa7e2f7a8ea4337c8d60c3a9a620e9e3e60caf12
2011-12-08 16:03:00 -08:00
Svetoslav Ganov
e723c6ad9c
am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
...
* commit '48b428fb1369a787a15fa6d8ebf10f8b31937a8b':
NumberPicker getting stuck if scroll wheel not wrapable.
2011-12-08 12:29:21 -08:00
Svetoslav Ganov
48b428fb13
Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
2011-12-08 12:28:11 -08:00
Gilles Debunne
168af0ca83
am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1
...
* commit 'aa4a5713aab73cf7c9486cd587a0d986a8daf7e3':
Make the Next key navigate between TextViews
2011-12-08 11:58:01 -08:00
Gilles Debunne
7e7f6dd7a7
am 0e7b8020: Merge "Limit created string size in Spell Checker" into ics-mr1
...
* commit '0e7b8020fd8607957844f7d67e8aaa6dc2ef816f':
Limit created string size in Spell Checker
2011-12-08 11:57:59 -08:00
Gilles Debunne
aa4a5713aa
Merge "Make the Next key navigate between TextViews" into ics-mr1
2011-12-08 11:57:06 -08:00
Gilles Debunne
0e7b8020fd
Merge "Limit created string size in Spell Checker" into ics-mr1
2011-12-08 11:56:28 -08:00
Gilles Debunne
06a8e9b1ce
Make the Next key navigate between TextViews
...
Bug 5718127
Fixes from changes introduced in
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=0500b3cfda5192efc09d6d4344b0c6c785c0a815
Change-Id: I4f6d213cd744b913b053275c4a26194cd030de84
2011-12-08 10:39:39 -08:00
Gilles Debunne
99324606d1
am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1
...
* commit 'a5a98a034b4d52c6bbc75e72f74f1a6ea1c61ed5':
IOOB is Suggestions
2011-12-08 10:01:34 -08:00
Gilles Debunne
2a5a9b4332
am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1
...
* commit '89f2e8a099c32cdbb8409482fe91dabea5a7673e':
Prevent NPE in SuggestionSpan
2011-12-08 10:01:33 -08:00
Gilles Debunne
a5a98a034b
Merge "IOOB is Suggestions" into ics-mr1
2011-12-08 09:59:44 -08:00
Gilles Debunne
89f2e8a099
Merge "Prevent NPE in SuggestionSpan" into ics-mr1
2011-12-08 09:59:29 -08:00
Jeff Brown
77741e8a1e
am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
...
* commit '8e0ecbfc97606ea30d0d8216fea635888f766b9d':
Shortcut keys should be handled on down, not up.
2011-12-07 23:30:53 -08:00
Jeff Brown
8e0ecbfc97
Merge "Shortcut keys should be handled on down, not up." into ics-mr1
2011-12-07 23:29:52 -08:00
Jeff Brown
7bedf24490
Shortcut keys should be handled on down, not up.
...
Bug: 5720360
Change-Id: I3afc278e576ea992c76f024c8b6bad14b214239c
2011-12-07 21:37:19 -08:00
Dave Burke
9650b018e3
am e118c1de: am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888 " into ics-mr1
...
* commit 'e118c1de0037e6732b66b9f52903567caa961c31':
Remove dangerous and useless optimization Bug #5525888
2011-12-07 20:43:18 -08:00
Dave Burke
86436a3ed0
am ef8913c0: Merge "Remove dangerous and useless optimization Bug #5525888 " into ics-mr1
...
* commit 'ef8913c035e679ea8b8891e26db1fa571e9b9d54':
Remove dangerous and useless optimization Bug #5525888
2011-12-07 20:41:49 -08:00
Dave Burke
ef8913c035
Merge "Remove dangerous and useless optimization Bug #5525888 " into ics-mr1
2011-12-07 20:40:10 -08:00
Jaikumar Ganesh
07c2c9f03b
am 38342c9d: am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1
...
* commit '38342c9d858d8b021bc5c616cfe6c0ab9f359b2b':
Reduce likelihood of crash in state machine.
2011-12-07 19:53:47 -08:00
Jaikumar Ganesh
ddf8a0e629
am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1
...
* commit 'd426c338a66f63f8e5528ac38ec5b61625f2c897':
Reduce likelihood of crash in state machine.
2011-12-07 19:51:26 -08:00
Jaikumar Ganesh
d426c338a6
Merge "Reduce likelihood of crash in state machine." into ics-mr1
2011-12-07 19:50:03 -08:00
Svetoslav Ganov
234484a9fb
NumberPicker getting stuck if scroll wheel not wrapable.
...
1. If the number picker was not wrapping the selector wheel
it was incorrectly initializing the fling scroller and
the error was proportional to the difference of the
current value and the max size. As a result if the number
picker gets stuck for a very long time.
2. The alpha of the selector wheel paint was not reset on
every subsequent fling so if the wheel was fading out
and a new fling is performed the selector wheel is
dimmed during the fling, rather bright.
bug:5728363
Change-Id: Ia90a6af86f162bda1b28f43f7ba7e4a9f5051b78
2011-12-07 19:35:15 -08:00
Romain Guy
c7ee3cab56
Remove dangerous and useless optimization
...
Bug #5525888
Change-Id: I553828c0da09b15d0dce3727e4c26a9d0bcf72ea
2011-12-07 19:10:04 -08:00
Gilles Debunne
b69c8cab56
am 0235016a: am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1
...
* commit '0235016acb241556f24689e3d818db6973b5ad4f':
Insert into user dict with the correct locale
2011-12-07 19:03:30 -08:00
Gilles Debunne
035b9c4099
am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1
...
* commit '2df13452e05745a3da624c34018da983173c32c4':
Insert into user dict with the correct locale
2011-12-07 18:42:07 -08:00
Gilles Debunne
2df13452e0
Merge "Insert into user dict with the correct locale" into ics-mr1
2011-12-07 18:41:04 -08:00