Gilles Debunne
c1761e7fe1
Fixed build after merge
...
Change-Id: Ifac89a70afa82047d97994860c6e58954f5d91d0
2011-12-12 16:11:47 -08:00
Matthew Xie
470d057aed
am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
...
* commit '18ad6514bbeb68a96c12ba1636ab8df8e3945f37':
Move broadcastState STATE_TURNING_ON before persistSwitchSetting
2011-12-12 15:39:27 -08:00
Gilles Debunne
7cb77c1a0d
resolved conflicts for merge of 1742f20c to master
...
Change-Id: I02d84edfe8cc0b71881884ecec21f831404aa555
2011-12-12 15:16:42 -08:00
Gilles Debunne
481c0a2604
am afa0a714: am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
...
* commit 'afa0a714acb45e90bdda3fd72b529a817a25f2d1':
Fixed SpellCheckerSessions leak in TextView
2011-12-12 13:15:53 -08:00
Gilles Debunne
e495cc3fd9
am e912a16b: am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1
...
* commit 'e912a16ba2a6e913b47893bc99c9a846d7ce80a9':
Re-use SpanSets in TextLine
2011-12-12 13:15:46 -08:00
Joe Malin
c789b60076
am 8e94d912: am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
...
* commit '8e94d912c6e0fc3c6d5e992b6559a0efc20372be':
DOC CHANGE: Package text and Formatter javadoc
2011-12-12 13:15:36 -08:00
Jake Hamby
36b8c2e682
am 555fe79c: am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
...
* commit '555fe79cdf037e7250f04591e60ecc8cff0cb95e':
Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
2011-12-12 12:35:09 -08:00
Matthew Xie
ed0830c502
Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
2011-12-12 12:07:39 -08:00
Matthew Xie
2d789e58a8
Move broadcastState STATE_TURNING_ON before persistSwitchSetting
...
CTS test revealed that persistSwitchSetting could take more than 1 second.
STATE_TURNING_ON intent missed the test timing. We move the broadcast
before persistSwitchSetting
bug 5740715
Change-Id: I54a0a0afc8d1c4fc28f84e6122809af2f1456ca7
2011-12-12 11:36:18 -08:00
Eric Fischer
c1e2aca598
Import revised translations. DO NOT MERGE
...
Change-Id: Ia118056259f828ff913d8a9bf2bc3a8fa2c54f9c
2011-12-12 10:59:11 -08:00
Amith Yamasani
549d5f88bf
Merge "Show the current stream's volume in the volume panel."
2011-12-12 09:56:26 -08:00
Ben Murdoch
2ff8cc2438
Merge "Clear the WebView picture when a new load starts."
2011-12-12 03:13:46 -08:00
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
Claudia de Veaux
f3aa0f78ff
Merge "Edit to string to change "double-touch" to "double-tap" per standard language."
2011-12-09 16:42:11 -08:00
Claudia de Veaux
c4c1ff90be
Edit to string to change "double-touch" to "double-tap" per standard language.
...
Bug: 5163232
Change-Id: Ifa045b16f52623005308a3ce9e4086c4e9e4590b
2011-12-09 14:42:54 -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
Jeff Brown
fa7fa9a5ba
am 944c985b: am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1
...
* commit '944c985b4199e6e029568ea87004c9727e469cc0':
Fix system hotkey handling.
2011-12-09 14:25:38 -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
Kristian Monsen
ed4ea72879
Update string lengths, fix for bug 5732776
...
Change-Id: Id668689085f542dae331eca197289ba45c5e4a5f
2011-12-09 17:56:43 +00: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
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
df37228951
Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
2011-12-08 18:18:25 -08:00
Gilles Debunne
316ca5059e
Merge "Re-use SpanSets in TextLine" into ics-mr1
2011-12-08 17:58:24 -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
Jake Hamby
c40f70a5cb
Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1
2011-12-08 15:51:33 -08:00
Fabrice Di Meglio
63b068040f
Merge "Clean TextLayout code and remove RTL_USE_HARFBUZZ"
2011-12-08 15:42:28 -08:00
Jake Hamby
48d50958af
Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
...
The ICS navigation guidelines state that the OK action should be to the
right of the cancel action in UI dialogs. Update the SIM PIN unlock and
SIM PUK unlock layouts to swap the OK and Cancel buttons (for soft keypad)
and the OK and Emergency Call buttons for the physical keyboard landscape
layout.
Bug: 5730977
Change-Id: Iaf565bc2b584292a34f5a72a7a763003f9149f27
2011-12-08 15:33:32 -08:00
Fabrice Di Meglio
b02d0ca555
Clean TextLayout code and remove RTL_USE_HARFBUZZ
...
- remove dependencies on ICU
- use TextLayouCache
- remove RTL_USE_HARFBUZZ define (we *are* using Harfbuzz now)
- also fix compilation warning
Change-Id: I022e11703438d07032e49e42724184f6bf16653e
2011-12-08 15:16:17 -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
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
Eric Fischer
ab6b816a76
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-12-08 11:09:11 -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
Eric Fischer
24783fcfb7
Import revised translations. DO NOT MERGE
...
Change-Id: I06d796d48b50c6a459b6ae8a6dad47730126a49d
2011-12-08 10:31:25 -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
8e0ecbfc97
Merge "Shortcut keys should be handled on down, not up." into ics-mr1
2011-12-07 23:29:52 -08:00
Jeff Brown
e0e9fd981c
Merge "Fix system hotkey handling." into ics-mr1
2011-12-07 23:29:45 -08:00