Danielle Millett
77c7b4ddeb
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-09 19:34:44 +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
Steve Block
d951473859
Merge "Clean up JavaDoc for WebView.addJavascriptInterface()"
2011-11-09 09:43:53 -08:00
John Reck
36a7f2a9ad
Merge "Fix determining find on page overlap" into ics-mr1
2011-11-09 09:28:11 -08:00
Steve Block
4cd73c5bfd
Clean up JavaDoc for WebView.addJavascriptInterface()
...
Bug: 5461416
Change-Id: Ic83e0e4035f6230134e4f36938e53f106c468876
2011-11-09 17:04:49 +00:00
Robert Greenwalt
c1b3cbe164
resolved conflicts for merge of ea54b760 to master
...
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8
2011-11-09 09:03:59 -08:00
Tom Taylor
81b10fd74e
am 1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
...
* commit '1366c756d28cdbb6c7c07959dfb4c93c81a9539d':
Add new secure setting for controlling Messaging notifications
2011-11-09 14:34:18 +00:00
Kristian Monsen
b69ce80383
Merge "Part of fix for bug 5584571 Add HTTP request header with app name"
2011-11-09 03:35:01 -08:00
Kristian Monsen
008c37d8f4
Part of fix for bug 5584571 Add HTTP request header with app name
...
Need the context to get the package name, adding it method here
that can be called from JNI.
Change-Id: I530d81d9d922ea73a3f9d185618a5c4cfde0aca7
2011-11-09 11:23:35 +00:00
Gilles Debunne
61ddbbae71
Visual glitches when starting extracted text
...
Partially addresses Bug 5547923
In landscape, tapping on the text
1. starts extracted text mode
2. displays the cursor handle or the selection popup window.
As a result, some ghost effects and race conditions create an
unpleasing visual experience.
Fixed this by not doing 2. in case extracted mode will start.
The drawback of this quicl fix is that the user will have to
tap again to get the handle/suggestion. That can be fixed later
if needed.
Change-Id: I10e1d8399bb35e5b2cd5cba1295f7d29d051cae0
2011-11-09 09:48:43 +01: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 Brown
319369f32f
Merge "Fix JavaDoc typos."
2011-11-08 20:41:09 -08:00
Jeff Brown
603f97f324
Fix JavaDoc typos.
...
Change-Id: Ieabcd5b89c89440f425917319225735445324765
2011-11-08 20:24:21 -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
Fabrice Di Meglio
5af447366d
Merge "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
2011-11-08 15:55:41 -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
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
Adam Cohen
75b2038004
Merge "Making default widget padding public API" into ics-mr1
2011-11-08 10:53:39 -08:00
Robert Greenwalt
604019c8d4
Merge "Fix build." into ics-mr1
2011-11-08 10:31:37 -08: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
Danielle Millett
b9b0825737
Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1
2011-11-08 10:03:24 -08:00
Robert Greenwalt
ea54b76085
Merge "Wimax : wimax framework related open source." into ics-mr1
2011-11-08 10:01:07 -08:00
Adam Powell
42b7e99b11
Fix bug 5544103 - Spinner text doesn't look dimmed when disabled
...
Pre-Holo spinners had a far more "buttony" look that expressed the
disabled state clearly, but Holo spinners are more subtle. As a result
we want to mark the contained view representing the current item as
disabled when the spinner itself is disabled.
Express this as a private framework style attribute that cannot be
changed at runtime.
Change-Id: Icff2ef2b8a3b1a96cbf00e4c75eda41a4dada7b3
2011-11-08 09:49:21 -08:00
Tom Taylor
1366c756d2
Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
2011-11-08 09:00:22 -08:00
John Reck
e43a7c18ec
am 99015a24: Merge "Remove unnecessary memory allocations" into ics-mr1
...
* commit '99015a2464a40097c3e23e07cdf69da0f886aa66':
Remove unnecessary memory allocations
2011-11-08 16:41:32 +00:00
John Reck
99015a2464
Merge "Remove unnecessary memory allocations" into ics-mr1
2011-11-08 08:38:07 -08:00
Ed Heyl
ba1f05d4a8
am 9d6a5162: Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
...
* commit '9d6a51623fdabbe993d7b8848794607394ef7cc2':
Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
2011-11-08 14:04:18 +00:00
Ed Heyl
9d6a51623f
Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
...
This reverts commit ae5839dcad .
2011-11-08 05:58:37 -08:00
Narayan Kamath
f537b25a98
am 98f5500c: Merge "Fix a bug in the network TTS api." into ics-mr1
...
* commit '98f5500c71754dad428e00d569007e0b98dc8aee':
Fix a bug in the network TTS api.
2011-11-08 10:13:39 +00:00
Narayan Kamath
98f5500c71
Merge "Fix a bug in the network TTS api." into ics-mr1
2011-11-08 02:09:18 -08:00
Gilles Debunne
c4c13f9704
am 39896f52: Merge "No more context menu in TextView" into ics-mr1
...
* commit '39896f52a84947ffc2062a2584033ff749d90534':
No more context menu in TextView
2011-11-08 08:53:03 +00:00
Gilles Debunne
39896f52a8
Merge "No more context menu in TextView" into ics-mr1
2011-11-08 00:48:27 -08:00
Matthew Xie
bfd9783556
am 67f1ceb6: Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
...
* commit '67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5':
Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp
2011-11-08 07:00:33 +00:00
Matthew Xie
67f1ceb616
Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
2011-11-07 22:42:00 -08:00
Jeff Brown
082b8007fb
Merge "Improve JavaDoc on AtomicFile."
2011-11-07 21:11:36 -08:00
Jim Miller
1f56edc6cd
Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen
...
Some carriers cannot process emergency calls when the IMSI is not available,
which happens when the SIM is locked. This allows the behavior to be overwritten
in an overlay. When the config variable is set to 'false', the emergency
button no longer appears on the SIM or PUK unlock screens.
Change-Id: I3127bfd5e7ebfabea997fbe048cc474e48b7a81c
2011-11-07 19:00:48 -08:00