satok
b199d4fada
am 114c4d38: Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1
...
* commit '114c4d3843758a2a1ffb32eb2719d65cdee637f8':
Introduce an API to cancel pending/running spell check tasks
2011-11-10 05:28:09 +00:00
satok
114c4d3843
Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1
2011-11-09 21:26:46 -08:00
satok
b4aff97c85
Introduce an API to cancel pending/running spell check tasks
...
Bug: 5554629
Change-Id: Ifd840ea13976813639a2ee259124a21d9bb56893
2011-11-10 11:50:45 +09:00
satok
acf8357f30
am 34bd5969: Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1
...
* commit '34bd596935ccd4574dbf6c6e7bfa24323e3e8e1f':
Respect user settings for spell checking language if explicitly set
2011-11-10 02:44:03 +00:00
satok
34bd596935
Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1
2011-11-09 18:42:48 -08:00
Jim Miller
d9147aad5e
am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
...
* commit '270826a8878b5470d48d93ca3d518ac93860870d':
Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen
2011-11-09 23:24:07 +00:00
Jim Miller
270826a887
Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
2011-11-09 15:19:31 -08:00
satok
05f2470061
Respect user settings for spell checking language if explicitly set
...
Bug: 5554116
Change-Id: I8c16d732af1fe713d30d97dfe829ff16653c7f34
2011-11-10 07:54:52 +09:00
Jeff Brown
6e1c362a21
am e7de36e6: Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1
...
* commit 'e7de36e605e0ccf4552c8ee1db40cb9af3227cf4':
Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022
2011-11-09 19:22:14 +00:00
Jeff Brown
e7de36e605
Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1
2011-11-09 11:20:24 -08:00
John Reck
22a073f073
am 36a7f2a9: Merge "Fix determining find on page overlap" into ics-mr1
...
* commit '36a7f2a9adfa21ec31f00d496fef82e68931c860':
Fix determining find on page overlap
2011-11-09 19:00:49 +00:00
Gilles Debunne
4eddb9356a
am 76bb11ca: Merge "Bug 5575396: close spell session on language change" into ics-mr1
...
* commit '76bb11ca642556673249a6ef8b84ab2813deaa87':
Bug 5575396: close spell session on language change
2011-11-09 18:59:45 +00:00
Jeff Sharkey
ba83524338
am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1
...
* commit '630a13bdd88723599a7617ca4df20ab923e7ffbb':
Bootstrap stats before registering listeners.
2011-11-09 18:59:40 +00:00
Jeff Sharkey
3c865c0a51
am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1
...
* commit '4c48d2ff6937e1e3a2fb93cc4cc29324b20542a5':
Make operation counts monotonically increase.
2011-11-09 18:59:38 +00:00
Dianne Hackborn
0126a4a7f2
am cd489c4c: Merge "Don\'t crash if there is no connectivity service." into ics-mr1
...
* commit 'cd489c4ce59c134c384238cbb613ede34f28189c':
Don't crash if there is no connectivity service.
2011-11-09 18:59:19 +00:00
Svetoslav Ganov
f32985381c
am 1bef480b: Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1
...
* commit '1bef480b223f03d0fc866f08ca101a07ead89bc2':
NumberPicker incorectly enforcing minimal width and height.
2011-11-09 18:59:14 +00:00
Jason Simmons
f981686779
resolved conflicts for merge of 3af8b88d to ics-aah
...
Change-Id: I2b68cd7c904e68a16565b7274560e7105c643c87
2011-11-09 10:08:21 -08:00
John Reck
36a7f2a9ad
Merge "Fix determining find on page overlap" into ics-mr1
2011-11-09 09:28:11 -08:00
Michael Kolb
d8883f5129
am a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1
...
* commit 'a4293ba1a0f1129d5879ae9eda45292ff357e20c':
Remove flicker from WebTextView
2011-11-09 14:37:36 +00:00
Dave Santoro
b7a262cdc1
am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1
...
* commit 'b78ae7524eecbca01a53994d6872202633c8341b':
Unhide social stream APIs for Contacts.
2011-11-09 14:37:19 +00:00
Matthew Xie
afb3fa6c96
am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
...
* commit '48542eb39e55f2d0e2a79d43e696ffb2acb67b5c':
Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
2011-11-09 14:37:11 +00:00
Adam Cohen
87ce25a772
am 75b20380: Merge "Making default widget padding public API" into ics-mr1
...
* commit '75b2038004f3338c68c9a0e89b29a31e10b237da':
Making default widget padding public API
2011-11-09 14:36:57 +00:00
Gilles Debunne
76bb11ca64
Merge "Bug 5575396: close spell session on language change" into ics-mr1
2011-11-09 00:26:46 -08:00
Jeff Sharkey
630a13bdd8
Merge "Bootstrap stats before registering listeners." into ics-mr1
2011-11-08 23:43:58 -08:00
Jeff Sharkey
4c48d2ff69
Merge "Make operation counts monotonically increase." into ics-mr1
2011-11-08 23:43:38 -08:00
Jeff Brown
0bde66a837
Throw TransactionTooLargeException when Binder transaction fails.
...
Bug: 5578022
Previously, Binder transactions failed silently, which caused
problems because apps would carry on assuming that the operation
had succeeded. Often, the apps would crash soon due to a violated
invariant, but sometimes they managed to do some damage first...
Change-Id: Ia9cc98b3b761a8160e7c4e87507860b5912c0451
2011-11-08 20:42:11 -08:00
Jeff Sharkey
3359aca765
Bootstrap stats before registering listeners.
...
Also move ISE to handled NonMonotonicException.
Bug: 5570872
Change-Id: I793f349287ef5589185f117dfbec6f1fad73a661
2011-11-08 18:24:12 -08:00
Dianne Hackborn
cd489c4ce5
Merge "Don't crash if there is no connectivity service." into ics-mr1
2011-11-08 17:58:26 -08:00
Jeff Sharkey
4abb1b8ef6
Make operation counts monotonically increase.
...
Bug: 5585704
Change-Id: I5247a68acdb209a4ef0f5aac18944595c295e6ca
2011-11-08 17:35:28 -08:00
Dianne Hackborn
d4d32c594f
Don't crash if there is no connectivity service.
...
Change-Id: I5f991896125fda22ff99b98a6aca244adbb17449
2011-11-08 17:33:59 -08:00
Svetoslav Ganov
1bef480b22
Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1
2011-11-08 17:33:49 -08:00
Dianne Hackborn
3af8b88d03
Merge "Add drop box reports of low memory." into ics-mr1
2011-11-08 17:01:05 -08:00
Michael Kolb
a4293ba1a0
Merge "Remove flicker from WebTextView" into ics-mr1
2011-11-08 16:34:53 -08:00
Dianne Hackborn
e4d4fbc8c0
Add drop box reports of low memory.
...
We are tagging these as "watchdog" to make them visible in the
reporting tools.
Also new am command to kill all background processes, mostly to make
it easier to test this stuff.
Change-Id: Ib9dc4747cd8bd44156fdf11d6a087cd4272203eb
2011-11-08 15:44:34 -08:00
John Reck
d6ac727234
Fix determining find on page overlap
...
Bug: 5572138
Change-Id: Ie528e1cf9df363307018e01a898e8d9dfff1cd45
2011-11-08 15:00:17 -08:00
Dave Santoro
b78ae7524e
Merge "Unhide social stream APIs for Contacts." into ics-mr1
2011-11-08 14:48:21 -08:00
Michael Kolb
39036ace76
Remove flicker from WebTextView
...
Bug: 5522186
Update LayoutParams when position changed only
Change-Id: I54beb489c261090d7ba258354449501b771fd98e
2011-11-08 14:21:06 -08:00
Mike Lockwood
5e99dbc85c
Merge "Add support for disabling wallpaper service" into ics-aah
2011-11-08 14:13:27 -08:00
Matthew Xie
48542eb39e
Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
2011-11-08 12:19:37 -08:00
Matthew Xie
ad2321027e
Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
...
Give APP a way to find out if a service is supported by a remote device
bug 5487202
Change-Id: I5a2d050cf24d945e1c9875963c34177ed1ce773a
2011-11-08 11:58:12 -08:00
Mike Lockwood
6026b825de
Merge "AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set." into ics-aah
2011-11-08 11:09:54 -08:00
Adam Cohen
75b2038004
Merge "Making default widget padding public API" into ics-mr1
2011-11-08 10:53:39 -08:00
Robert Greenwalt
a74ebb6d08
am 604019c8: Merge "Fix build." into ics-mr1
...
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
Fix build.
2011-11-08 18:33:20 +00:00
Robert Greenwalt
604019c8d4
Merge "Fix build." into ics-mr1
2011-11-08 10:31:37 -08:00
Mike Lockwood
a2aa08e20c
AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set.
...
This allows Music2 and other media apps to control master volume without changing their code
Bug: 5567694
Change-Id: I48b6260b193b22c395be5a31cd1d270b2929a91e
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-11-08 10:31:21 -08:00
Adam Powell
a7d41ece61
am 8689afbd: Merge "Fix bug 5544103 - Spinner text doesn\'t look dimmed when disabled" into ics-mr1
...
* commit '8689afbd63db3b1af6058709da843ea9d6433b21':
Fix bug 5544103 - Spinner text doesn't look dimmed when disabled
2011-11-08 18:28:23 +00:00
Danielle Millett
ad28cd9c93
am b9b08257: Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1
...
* commit 'b9b08257370d244b4bccc4e243dda3c4daf4b0af':
Showing a congratulations screen after choosing face unlock backup lock
2011-11-08 18:28:21 +00:00
Robert Greenwalt
b45a317b56
am ea54b760: Merge "Wimax : wimax framework related open source." into ics-mr1
...
* commit 'ea54b7608584bc0535c9e89417778c3e95b50975':
Wimax : wimax framework related open source.
2011-11-08 18:28:16 +00:00
Robert Greenwalt
8588e47358
Fix build.
...
Missed a commit that fixed some issues.
bug:5237167
Change-Id: I61e44831e2c3f1cf613ca1387aa95d712b7d2ded
2011-11-08 10:12:25 -08:00
Adam Powell
8689afbd63
Merge "Fix bug 5544103 - Spinner text doesn't look dimmed when disabled" into ics-mr1
2011-11-08 10:06:00 -08:00