Dianne Hackborn
48ee51870e
am cbc52b7b: Merge change Iee638412 into eclair
...
Merge commit 'cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910' into eclair-mr2
* commit 'cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910':
Fix issue #2161726 : Car dock app bypasses setup wizard
2009-10-04 15:27:09 -07:00
Scott Main
daaccd111d
am 87d5004d: am e9e1cdd5: decode the search string before putting it into the search control. this fixes a safari-only bug in which encoded chars were inserted into the search string.
...
Merge commit '87d5004d3b62441a55b2aba870e4276af6c771eb' into eclair-mr2
* commit '87d5004d3b62441a55b2aba870e4276af6c771eb':
decode the search string before putting it into the search control.
2009-10-04 15:27:00 -07:00
Mike Lockwood
f6c2bed73d
am 2ecf3f5e: dumpstate: Add backlight information to bugreport output.
...
Merge commit '2ecf3f5e00ea2ac630ffb405baba33113596cf38' into eclair-mr2
* commit '2ecf3f5e00ea2ac630ffb405baba33113596cf38':
dumpstate: Add backlight information to bugreport output.
2009-10-04 15:22:08 -07:00
Mathias Agopian
f7c539a9ed
am f8e4bc9f: Merge change I0c4cec7e into eclair
...
Merge commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70' into eclair-mr2
* commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70':
Attempt to fix [2152536] ANR in browser
2009-10-04 15:21:34 -07:00
Jason Sams
2a10c3abcb
am 8df16d63: Merge change I7f047786 into eclair
...
Merge commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc' into eclair-mr2
* commit '8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc':
Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion.
2009-10-04 15:21:04 -07:00
Dmitri Plotnikov
c7ce573a47
am 82e863d8: Merge change Ic0d82ef1 into eclair
...
Merge commit '82e863d8ab5166fec3dce96ae865d1e2d3bbc021' into eclair-mr2
* commit '82e863d8ab5166fec3dce96ae865d1e2d3bbc021':
[Issue 2161366] Changing capitalization of string "Via" to "via"
2009-10-04 15:20:26 -07:00
Android (Google) Code Review
5053fcd11e
Merge change Iee638412 into eclair
...
* changes:
Fix issue #2161726 : Car dock app bypasses setup wizard
2009-10-04 18:19:29 -04:00
San Mehat
815fbdff91
am 7b16834a: Merge change Iaf686344 into eclair
...
Merge commit '7b16834adc1003f492cd2be4b1bcc3fb73a78c23' into eclair-mr2
* commit '7b16834adc1003f492cd2be4b1bcc3fb73a78c23':
dumpstate: Display mtime instead of ctime
2009-10-04 15:19:27 -07:00
Wei Huang
3d32110de0
am 6b370745: bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
...
Merge commit '6b3707452c5921c89258371eec140b0fb76766f8' into eclair-mr2
* commit '6b3707452c5921c89258371eec140b0fb76766f8':
bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
2009-10-04 15:19:08 -07:00
Mike Cleron
7e7648ccdf
am df64cb41: Merge change I80ce8833 into eclair
...
Merge commit 'df64cb41fb44d56957cba8e375788d98af7bd8b4' into eclair-mr2
* commit 'df64cb41fb44d56957cba8e375788d98af7bd8b4':
Icons again
2009-10-04 15:17:27 -07:00
David Brown
1d0d1a81ae
am 88e03757: RotarySelector widget: add callback for "grabbed" state changes.
...
Merge commit '88e037577f7db140e4ef88b77eefaa910e06e5f5' into eclair-mr2
* commit '88e037577f7db140e4ef88b77eefaa910e06e5f5':
RotarySelector widget: add callback for "grabbed" state changes.
2009-10-04 15:17:18 -07:00
Eric Fischer
bb1311c7fd
am 3d7bb3a5: (-s ours) Merge change I3ca8fb69 into eclair
...
Merge commit '3d7bb3a5e49b559725bba84390b1021d9c527347' into eclair-mr2
* commit '3d7bb3a5e49b559725bba84390b1021d9c527347':
Import revised translations. DO NOT MERGE
2009-10-04 15:16:07 -07:00
Jaikumar Ganesh
0eed5fb0db
am d453fe67: Merge change I5dbd1994 into eclair
...
Merge commit 'd453fe6709c4d28350e34fa39b4fe73d98a36a0c' into eclair-mr2
* commit 'd453fe6709c4d28350e34fa39b4fe73d98a36a0c':
Fix rfcomm socket connect return code.
2009-10-04 15:14:55 -07:00
Mathias Agopian
d11f60ec4f
am 4ac45597: Merge change I15b0ebb9 into eclair
...
Merge commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-mr2
* commit '4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
a simple test app for gralloc
2009-10-04 15:14:32 -07:00
Joe Onorato
040d07bff5
am d14cfc27: Merge change I9e384ddd into eclair
...
Merge commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620' into eclair-mr2
* commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620':
Add a test pattern as rollo's icon
2009-10-04 15:14:08 -07:00
John Wang
285c10b073
am 99510681: Unhide constant DATA_ACTIVITY_DORMANT.
...
Merge commit '99510681e9f1c76f82719e724990f744cfdbcefd' into eclair-mr2
* commit '99510681e9f1c76f82719e724990f744cfdbcefd':
Unhide constant DATA_ACTIVITY_DORMANT.
2009-10-04 15:13:58 -07:00
Scott Main
b5e834ca25
am e9e1cdd5: decode the search string before putting it into the search control. this fixes a safari-only bug in which encoded chars were inserted into the search string.
...
Merge commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3' into eclair
* commit 'e9e1cdd556b40a04637b7de3d839b2a596df47e3':
decode the search string before putting it into the search control.
2009-10-04 15:05:43 -07:00
Android (Google) Code Review
0b7b65da2f
Merge change I0c4cec7e into eclair
...
* changes:
Attempt to fix [2152536] ANR in browser
2009-10-02 23:35:12 -04:00
Android (Google) Code Review
09fa0b2d73
Merge change I7f047786 into eclair
...
* changes:
Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion.
2009-10-02 21:40:07 -04:00
Mathias Agopian
0b3ad46a26
Attempt to fix [2152536] ANR in browser
...
The ANR is caused by SurfaceFlinger waiting for buffers of a removed surface to become availlable.
When it is removed from the current list, a Surface is marked as NO_INIT, which causes SF to return
immediately in the above case. For some reason, the surface here wasn't marked as NO_INIT.
This change makes the code more robust by always (irregadless or errors) setting the NO_INIT status
in all code paths where a surface is removed from the list.
Additionaly added more information in the logs, should this happen again.
2009-10-02 18:12:30 -07:00
Android (Google) Code Review
b3e869c7a8
Merge change Ic0d82ef1 into eclair
...
* changes:
[Issue 2161366] Changing capitalization of string "Via" to "via"
2009-10-02 19:17:30 -04:00
Android (Google) Code Review
83af4c76ba
Merge change Ib4285d22 into eclair-mr2
...
* changes:
Change way we choose EGL surfaces to be compatible with the native window surface.
2009-10-02 17:49:59 -04:00
Jack Palevich
99dd08fc36
Change way we choose EGL surfaces to be compatible with the native
...
window surface.
2009-10-02 14:43:51 -07:00
Android (Google) Code Review
95cacf9e36
Merge change Ic66f68a7 into eclair-mr2
...
* changes:
Fix a null pointer exception caught by the monkey.
2009-10-02 16:35:51 -04:00
Android (Google) Code Review
c91af0c12e
Merge change Iaf686344 into eclair
...
* changes:
dumpstate: Display mtime instead of ctime
2009-10-02 16:34:02 -04:00
Android (Google) Code Review
0730b80d66
Merge change I499a9541 into eclair-mr2
...
* changes:
setupRedirect() can throw. Catch it and signal the error.
2009-10-02 16:28:11 -04:00
Android (Google) Code Review
4d15bec90d
Merge change I80ce8833 into eclair
...
* changes:
Icons again
2009-10-02 03:51:19 -04:00
Android (Google) Code Review
d835114b97
Merge change I3ca8fb69 into eclair
...
* changes:
Import revised translations. DO NOT MERGE
2009-10-02 00:47:08 -04:00
Android (Google) Code Review
e659abef6d
Merge change I5dbd1994 into eclair
...
* changes:
Fix rfcomm socket connect return code.
2009-10-01 22:46:23 -04:00
Android (Google) Code Review
c999d3f235
Merge change I15b0ebb9 into eclair
...
* changes:
a simple test app for gralloc
2009-10-01 20:25:45 -04:00
Mathias Agopian
7460160b80
a simple test app for gralloc
2009-10-01 17:23:05 -07:00
Android (Google) Code Review
2a307faa64
Merge change I9e384ddd into eclair
...
* changes:
Add a test pattern as rollo's icon
2009-10-01 19:49:27 -04:00
android-build SharedAccount
598331dd30
Merge commit 'goog/eclair' into eclair-release
2009-10-01 08:43:40 -07:00
Android (Google) Code Review
3431c6cba8
Merge change I6e01fa52 into eclair
...
* changes:
Remove unneeded icon.
2009-10-01 11:01:34 -04:00
Android (Google) Code Review
00dcab7c05
Merge change Ic2a16d4f into eclair
...
* changes:
b/2148252 Fix emulator
2009-10-01 10:52:01 -04:00
Android (Google) Code Review
3a6e128828
Merge change Ia8826d67 into eclair
...
* changes:
improve boot animation a bit
2009-10-01 06:16:25 -04:00
Android (Google) Code Review
64005a6ff0
Merge change Ie69a9c0a into eclair
...
* changes:
Remove globalSearch argument from triggerSearch()
2009-10-01 05:10:15 -04:00
Android (Google) Code Review
0026f57ccc
Merge change I55c9c7b7 into eclair
...
* changes:
New 1x status bar icons
2009-10-01 04:48:32 -04:00
Android (Google) Code Review
dea7c01361
Merge change I4fe2a47a into eclair
...
* changes:
Fix stopping all vpn daemons before connect and more.
2009-10-01 04:39:38 -04:00
Android (Google) Code Review
f7f1268c60
Merge change Ia1baa5ab into eclair
...
* changes:
More icons
2009-10-01 03:35:27 -04:00
Android (Google) Code Review
2326df2d5b
Merge change I793b4f62 into eclair
...
* changes:
Clean up search and voice search button assets for high res.
2009-10-01 03:30:34 -04:00
Android (Google) Code Review
4dd752c9cc
Merge change I2919f492 into eclair
...
* changes:
remove cert for SampleBrowserPlugin and only check signature for the release build.
2009-10-01 02:37:18 -04:00
Android (Google) Code Review
3b2a59bc95
Merge change I7a39c564 into eclair
...
* changes:
Fix docs error
2009-10-01 01:27:16 -04:00
Android (Google) Code Review
bd9daeecec
Merge change Iaf08eabc into eclair
...
* changes:
Reduce the ConnectivityManager logging.
2009-10-01 01:14:38 -04:00
Android (Google) Code Review
8642995452
Merge change Id60fa26a into eclair
...
* changes:
Fix issue 2152541 thumbnail images stretched.
2009-10-01 01:12:35 -04:00
Android (Google) Code Review
c3ea63af0e
Merge change Id703d6bb into eclair
...
* changes:
Black is the new black
2009-10-01 01:06:16 -04:00
Android (Google) Code Review
8eb9b0a200
Merge change I94132420 into eclair
...
* changes:
Fix network-feature timeout code.
2009-10-01 00:43:51 -04:00
Android (Google) Code Review
0bac4c0afe
Merge change I07729abd into eclair
...
* changes:
Keep the scrollbar on during TOUCH_MOVE events even when there is no movement.
2009-10-01 00:41:21 -04:00
Android (Google) Code Review
aec1f42bc4
Merge change I55e15bad into eclair
...
* changes:
Try to reconnect twice when the rfcomm error code is Connection Refused.
2009-10-01 00:00:17 -04:00
Android (Google) Code Review
9152ac7e9c
Merge change I98f2db38 into eclair
...
* changes:
FastTrack->QuickContact
2009-10-01 00:00:07 -04:00