Jake Hamby
cd9f8ea3be
am 665935c1: Merge "Enable SMS short code patterns to be updated from secure settings." into jb-dev
...
* commit '665935c10ad281721c495621fab7561f2a28842e':
Enable SMS short code patterns to be updated from secure settings.
2012-05-17 17:59:43 -07:00
Jake Hamby
665935c10a
Merge "Enable SMS short code patterns to be updated from secure settings." into jb-dev
2012-05-17 17:57:45 -07:00
Svetoslav Ganov
65e8ecf37b
am a1daf827: Merge "Fix paragraph iterator." into jb-dev
...
* commit 'a1daf82732c8529bcf9258f42e2cc22be9fa684b':
Fix paragraph iterator.
2012-05-17 17:25:44 -07:00
Svetoslav Ganov
a1daf82732
Merge "Fix paragraph iterator." into jb-dev
2012-05-17 17:23:16 -07:00
Charles Chen
a48374db17
am c6015df1: Merge "Add actions to non-JavaScript accessibility handler." into jb-dev
...
* commit 'c6015df128811a52faf918bd34d0d7296c8a6834':
Add actions to non-JavaScript accessibility handler.
2012-05-17 17:17:27 -07:00
Charles Chen
4d39ba269c
am 9a9a041c: Merge "Add movement actions to JS accessibility." into jb-dev
...
* commit '9a9a041cb75a803856b22191db7e6bde7f1412e8':
Add movement actions to JS accessibility.
2012-05-17 17:17:25 -07:00
John Reck
ce619a9675
am 3d6f7ead: Merge "Tweak show/hide of touch highlight" into jb-dev
...
* commit '3d6f7eadb27d37f3c1e2a9505526c5f4a6cf990e':
Tweak show/hide of touch highlight
2012-05-17 17:17:22 -07:00
Kenny Root
8101eb7a74
am ae9d040f: Merge "Wait for ASECs to be scanned before proceeding" into jb-dev
...
* commit 'ae9d040f715130389de3dbc3bf52e24e5f29425a':
Wait for ASECs to be scanned before proceeding
2012-05-17 17:17:19 -07:00
Jeff Brown
90ab4341cf
am dc9445ba: Merge "Add support for grouping keyboard layouts by collection." into jb-dev
...
* commit 'dc9445ba4cb2e261719d3c38956d9cbe1fddcd64':
Add support for grouping keyboard layouts by collection.
2012-05-17 17:17:15 -07:00
Jean-Michel Trivi
e215af22bf
am c79a9eac: Merge "New action and extra in RecognizerIntent for "hands free" voice search" into jb-dev
...
* commit 'c79a9eaced675d176dda570da6a08c6e54743bec':
New action and extra in RecognizerIntent for "hands free" voice search
2012-05-17 17:17:07 -07:00
Charles Chen
c6015df128
Merge "Add actions to non-JavaScript accessibility handler." into jb-dev
2012-05-17 16:55:40 -07:00
Charles Chen
9a9a041cb7
Merge "Add movement actions to JS accessibility." into jb-dev
2012-05-17 16:55:20 -07:00
John Reck
3d6f7eadb2
Merge "Tweak show/hide of touch highlight" into jb-dev
2012-05-17 16:44:14 -07:00
Kenny Root
ae9d040f71
Merge "Wait for ASECs to be scanned before proceeding" into jb-dev
2012-05-17 16:42:09 -07:00
Jeff Brown
dc9445ba4c
Merge "Add support for grouping keyboard layouts by collection." into jb-dev
2012-05-17 16:33:40 -07:00
Jake Hamby
172d97edcd
Enable SMS short code patterns to be updated from secure settings.
...
The premium SMS short code detector loads patterns from an XML resource
by default (frameworks/base/core/res/res/xml/sms_short_codes.xml).
Add support for updated patterns to be loaded on a per-country basis
from a secure setting named "sms_short_codes_" + the country code.
Updated patterns can be pushed to Google devices via Gservices.
Bug: 5513975
Change-Id: Ibfc0be4f12227ba45c28396ec7cdbc307442af81
2012-05-17 16:29:44 -07:00
Jean-Michel Trivi
c79a9eaced
Merge "New action and extra in RecognizerIntent for "hands free" voice search" into jb-dev
2012-05-17 16:06:54 -07:00
Kenny Root
51a573c767
Wait for ASECs to be scanned before proceeding
...
Move MountService up the list, then pause waiting for MountService to
finish scanning ASECs before the services that require those packages to
be ready.
Additionally, don't automatically mark all ASEC apps as FLAG_EXTERNAL on
reboot. This prevents AppWidgets and other things from being used with
ASECs which are on internal storage.
Bug: 6445613
Change-Id: I3e0b3e244fec966814d7a5ea93de5d337aea79bd
2012-05-17 16:06:54 -07:00
Jeff Brown
d9fec5d317
Add support for grouping keyboard layouts by collection.
...
Bug: 6405203
Change-Id: Id818b27ec09928150795d594a96df186a6e39168
2012-05-17 16:01:54 -07:00
Jean-Michel Trivi
482c9bb390
New action and extra in RecognizerIntent for "hands free" voice search
...
New action and extra for android.speech.RecognizerIntent:
ACTION_VOICE_SEARCH_HANDS_FREE
EXTRA_SECURE
Change-Id: I1f390ede4f4087bae1781347bb211dc0a093e857
2012-05-17 15:43:40 -07:00
Martijn Coenen
47e5794baa
am d42ad1da: Merge "NFC API documentation." into jb-dev
...
* commit 'd42ad1da2fbf29382d624ad1e1bd2c7519e3377f':
NFC API documentation.
2012-05-17 15:32:45 -07:00
Martijn Coenen
d42ad1da2f
Merge "NFC API documentation." into jb-dev
2012-05-17 15:30:08 -07:00
George Mount
aa5f858176
am ea1603de: Merge "Update the IME with selection and composing region changes." into jb-dev
...
* commit 'ea1603de2a364cd857b800579e5b90f3c03b030a':
Update the IME with selection and composing region changes.
2012-05-17 15:23:28 -07:00
George Mount
e0df34f603
am bb8549db: Merge "Sync the selection cursor when adjusting caret handle." into jb-dev
...
* commit 'bb8549dbb1fbe5c60cbe70e4afcb5ef802893bf6':
Sync the selection cursor when adjusting caret handle.
2012-05-17 15:23:26 -07:00
George Mount
ea1603de2a
Merge "Update the IME with selection and composing region changes." into jb-dev
2012-05-17 15:21:07 -07:00
George Mount
bb8549dbb1
Merge "Sync the selection cursor when adjusting caret handle." into jb-dev
2012-05-17 15:21:01 -07:00
George Mount
e41dfd9759
Sync the selection cursor when adjusting caret handle.
...
Bug 6512357
Change-Id: Ie8b0c6a17ea668b2c4ba9f3de404fdc0c2d319f8
2012-05-17 14:10:28 -07:00
alanv
9768832da8
Fix paragraph iterator.
...
Bug: 6509239
Change-Id: I628d7fd07cda24c66a0fa3f456e0141786e768a5
2012-05-17 13:54:30 -07:00
John Reck
eb11f47353
Tweak show/hide of touch highlight
...
Bug: 6490959
Fixes the issue where we will show the old tap highlight
if webkit isn't quick enough to respond
Change-Id: Icd9864d276b6ad311e3f3dc4deaa7085e3769006
2012-05-17 13:47:39 -07:00
Craig Mautner
a978d9bfef
am d51a68b3: Merge "Eliminate deferred surface destruction." into jb-dev
...
* commit 'd51a68b3d2d347be989b53af1777454f97ad9b46':
Eliminate deferred surface destruction.
2012-05-17 13:13:56 -07:00
Craig Mautner
d51a68b3d2
Merge "Eliminate deferred surface destruction." into jb-dev
2012-05-17 13:11:50 -07:00
Jesse Wilson
0ddb5d3b5d
am 9cb376e7: Merge "Change NPN to forbid empty lists of protocols." into jb-dev
...
* commit '9cb376e792567b5278e0eb418a3aeb848339a283':
Change NPN to forbid empty lists of protocols.
2012-05-17 11:20:21 -07:00
Jesse Wilson
9cb376e792
Merge "Change NPN to forbid empty lists of protocols." into jb-dev
2012-05-17 11:18:33 -07:00
George Mount
cdd48a70df
Update the IME with selection and composing region changes.
...
Bug 6507332
The IME must be informed whenever the selection or composing
region changes so that it can adjust its replacement regions
and suggestions.
Change-Id: I484b112a2fede6528b0bc506711284b59bd886d1
2012-05-17 10:51:18 -07:00
Jesse Wilson
2108ead7f1
Change NPN to forbid empty lists of protocols.
...
Bug: http://b/6438423
Change-Id: Ie89220e5bc219396c15dbe1feaa2f74fa1b243eb
2012-05-17 13:46:17 -04:00
Svetoslav Ganov
91408aae7a
am 308904dc: Merge "Refactor WebView accessibility code into a separate class." into jb-dev
...
* commit '308904dcd01c7bdadd183f262ead408856822a0e':
Refactor WebView accessibility code into a separate class.
2012-05-17 10:34:19 -07:00
Svetoslav Ganov
308904dcd0
Merge "Refactor WebView accessibility code into a separate class." into jb-dev
2012-05-17 10:32:27 -07:00
Amith Yamasani
00e5d8bbc9
am e43e08bb: Merge "Avoid launching dialogs twice from double-clicking a preference." into jb-dev
...
* commit 'e43e08bb24f1ecb85c2f045ae66799f23588de43':
Avoid launching dialogs twice from double-clicking a preference.
2012-05-17 10:00:24 -07:00
Amith Yamasani
e43e08bb24
Merge "Avoid launching dialogs twice from double-clicking a preference." into jb-dev
2012-05-17 09:57:38 -07:00
John Reck
5653f28030
am 76c0c612: Merge "Don\'t send an ontouchmove until slop is exceeded" into jb-dev
...
* commit '76c0c612cdd5eeef8ff2f7a4478f6320a713d7a3':
Don't send an ontouchmove until slop is exceeded
2012-05-17 09:24:57 -07:00
John Reck
76c0c612cd
Merge "Don't send an ontouchmove until slop is exceeded" into jb-dev
2012-05-17 09:22:06 -07:00
George Mount
2354206216
am 3c814072: Merge "Only clear the caret when in caret selection mode." into jb-dev
...
* commit '3c8140723f67b63163ed1a3d6b0569ecbe46068c':
Only clear the caret when in caret selection mode.
2012-05-17 09:07:58 -07:00
George Mount
45240cb33a
am 84c4b08b: Merge changes Ia5729aaf,I91584b7d into jb-dev
...
* commit '84c4b08bd424151f3fa84029b55573022562fd23':
Remove selection highlight when replacing/deleting.
Don't do character add/delete when there is a selection.
2012-05-17 09:07:57 -07:00
George Mount
3c8140723f
Merge "Only clear the caret when in caret selection mode." into jb-dev
2012-05-17 09:05:37 -07:00
George Mount
84c4b08bd4
Merge changes Ia5729aaf,I91584b7d into jb-dev
...
* changes:
Remove selection highlight when replacing/deleting.
Don't do character add/delete when there is a selection.
2012-05-17 09:05:30 -07:00
Ben Murdoch
d36bde2494
am 93e3bf12: Merge "Fix up the WebCoreThreadWatchdog" into jb-dev
...
* commit '93e3bf1260557f2b167c7f7b1e671deb69edec3f':
Fix up the WebCoreThreadWatchdog
2012-05-17 09:03:02 -07:00
Ben Murdoch
93e3bf1260
Merge "Fix up the WebCoreThreadWatchdog" into jb-dev
2012-05-17 09:00:26 -07:00
Chris Wren
125a45ed82
am 468a2ac6: Merge "Don\'t assume digest lines are GONE, we may be recycling them." into jb-dev
...
* commit '468a2ac63a065680da30f5e796583d53f70f8e25':
Don't assume digest lines are GONE, we may be recycling them.
2012-05-17 07:02:30 -07:00
Chris Wren
4ed80d581c
Don't assume digest lines are GONE, we may be recycling them.
...
Bug: 6500945
Change-Id: I0f01ccdde25bebb8335f0d34408877b895d286ff
2012-05-17 09:35:34 -04:00
Ben Murdoch
74d37b9653
Fix up the WebCoreThreadWatchdog
...
Make the WebCoreWatchdog aware of the WebViews it is monitoring
(rather than the Activity context which may become stale) and
ensure that the code for the prompt dialog is run on the UI
thread.
Bug: 6420310
Change-Id: Ied003938edb04858c85bcc2491c4b2c4c0ede6eb
2012-05-17 12:38:07 +01:00