Mike Lockwood
11cb5cb9e3
Merge "MtpClient: Fix problem with getDeviceList() returning empty result in some cases" into honeycomb-mr1
2011-03-07 13:23:40 -08:00
Leon Scroggins
69ee2688e8
New button assets for webview. DO NOT MERGE
...
Bug:3009375
Change-Id: I27fc6a62845075f4a5f5708ef0a12dd928b12403
2011-03-07 16:22:11 -05:00
Eric Fischer
e421c63f79
am 48eb658b: (-s ours) am c5f7f582: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '48eb658bd9eedf0ef0e03613a21604e238cb0360':
Import revised translations. DO NOT MERGE
2011-03-07 13:17:56 -08:00
Eric Fischer
48eb658bd9
am c5f7f582: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'c5f7f582a6b7632c34270a9d1edb04bc4b7e2640':
Import revised translations. DO NOT MERGE
2011-03-07 13:07:58 -08:00
Eric Fischer
c5f7f582a6
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-07 13:03:44 -08:00
Vasu Nori
670e5ddfa6
am f114e67e: am 0f73fe1c: Merge "bug:3513950 Rename "completedDownload" to "addCompletedDownload"" into honeycomb-mr1
...
* commit 'f114e67edd85e874b54f0a7061addf4b43d35076':
bug:3513950 Rename "completedDownload" to "addCompletedDownload"
2011-03-07 12:55:38 -08:00
Eric Fischer
e5d97c7fde
Import revised translations. DO NOT MERGE
...
Change-Id: Id71f94e856fb7e4cbc9b24ff6afa9085b0e03244
2011-03-07 12:53:42 -08:00
Vasu Nori
f114e67edd
am 0f73fe1c: Merge "bug:3513950 Rename "completedDownload" to "addCompletedDownload"" into honeycomb-mr1
...
* commit '0f73fe1c847f260d52675ffc1ef54b6daf136772':
bug:3513950 Rename "completedDownload" to "addCompletedDownload"
2011-03-07 12:51:50 -08:00
Vasu Nori
0f73fe1c84
Merge "bug:3513950 Rename "completedDownload" to "addCompletedDownload"" into honeycomb-mr1
2011-03-07 12:46:59 -08:00
Dianne Hackborn
db773c5572
Fix issue #3515088 : Don't be so aggressive trying to reclaim memory
...
Change-Id: I8184306fa8c27a41b8bcfcad8d96985be8f0c9aa
2011-03-07 11:57:33 -08:00
Patrick Dubroy
c3549dd49b
am aca79826: am 19960989: Merge "Remove guard preventing onDetachedFromWindow() from being called" into honeycomb-mr1
...
* commit 'aca79826484ee8eaaae42beabe1b21fdc5fbbab7':
Remove guard preventing onDetachedFromWindow() from being called
2011-03-07 11:56:42 -08:00
Patrick Dubroy
aca7982648
am 19960989: Merge "Remove guard preventing onDetachedFromWindow() from being called" into honeycomb-mr1
...
* commit '19960989e2c5ad60e4d05ebb3b31bc25ecd751af':
Remove guard preventing onDetachedFromWindow() from being called
2011-03-07 11:54:22 -08:00
Jeff Brown
3cc75247ea
am fd47c5ee: (-s ours) am f0210c36: Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1
...
* commit 'fd47c5eea2a4393b5c9897bb80db721809146aaf':
Joystick tweaks. (DO NOT MERGE)
2011-03-07 11:52:07 -08:00
Patrick Dubroy
19960989e2
Merge "Remove guard preventing onDetachedFromWindow() from being called" into honeycomb-mr1
2011-03-07 11:51:50 -08:00
Vasu Nori
3728130310
bug:3513950 Rename "completedDownload" to "addCompletedDownload"
...
Change-Id: I28b33a0268309d74fd2512b5bdb599f38ff3a96d
2011-03-07 11:51:14 -08:00
Jeff Brown
fd47c5eea2
am f0210c36: Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1
...
* commit 'f0210c36218c03dc30e444ef85690dc815097920':
Joystick tweaks. (DO NOT MERGE)
2011-03-07 11:49:52 -08:00
Jeff Brown
f0210c3621
Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1
2011-03-07 11:47:58 -08:00
satok
8295e27007
Merge "Fix a test for system properties in frameworks/base/core"
2011-03-07 11:41:02 -08:00
satok
decee8d35b
Fix a test for system properties in frameworks/base/core
...
Change-Id: Id588d63ae4cae8c25b430c4ff7719173dacc70bb
2011-03-07 11:32:51 -08:00
Romain Guy
5a383c1f75
am 15c6b719: am 0aaa11ed: Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1
...
* commit '15c6b719fe8d1f4b27b4fa66ac94eede3957caf2':
Remove many unnecessary save/restore calls.
2011-03-07 11:28:13 -08:00
Romain Guy
15c6b719fe
am 0aaa11ed: Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1
...
* commit '0aaa11ed5be45170fb2535a6ce021c92b18d8878':
Remove many unnecessary save/restore calls.
2011-03-07 11:25:41 -08:00
Romain Guy
0aaa11ed5b
Merge "Remove many unnecessary save/restore calls." into honeycomb-mr1
2011-03-07 11:24:02 -08:00
Mike Lockwood
2b8a1ee057
MtpClient: Fix problem with getDeviceList() returning empty result in some cases
...
BUG: 3503128
Change-Id: I2263437d6018848e316ae4096eb07305fc4dc486
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-07 14:19:06 -05:00
Soojung Shin
3fff651497
am 3fe49d81: am fa680a18: am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
...
* commit '3fe49d8168ab7344d495ea5ee8ed6b9ef3145495':
Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-07 11:16:07 -08:00
Soojung Shin
3fe49d8168
am fa680a18: am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
...
* commit 'fa680a18f617de202912b8a9fe3fc0890a9fe09e':
Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-07 11:10:28 -08:00
Patrick Dubroy
8620d9533a
Remove guard preventing onDetachedFromWindow() from being called
...
This was the cause of 3510699: Launcher has leaked IntentReceiver.
Change-Id: I7d0e4662314d657f6ac06a9a9d37861f8d8ee975
2011-03-07 11:07:26 -08:00
Wink Saville
89586a7d0a
Remove mRetryMgr and directly use DataConnection retry mgr.
...
DataConnection now wraps its retry manager instead of exporting it.
Change-Id: I2ec0d2cf2519574fed7915b34451c1061f59cee4
2011-03-07 11:07:09 -08:00
Andreas Huber
bfa40efc9b
Merge "Added more metadata published by the MediaMetaDataRetriever"
2011-03-07 11:03:28 -08:00
Daniel Sandler
2697884b39
am a1a998af: am ec1f1f4c: Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1
...
* commit 'a1a998af3b47ecec4ee3f65eda723b7cb50e7699':
When the user touches a peeked notification, reset the fadeout timer.
Fix touches on glowing region around panel.
2011-03-07 10:54:36 -08:00
Daniel Sandler
a1a998af3b
am ec1f1f4c: Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1
...
* commit 'ec1f1f4cfc6e253cee4320fe33a385d2218a9bb2':
When the user touches a peeked notification, reset the fadeout timer.
Fix touches on glowing region around panel.
2011-03-07 10:50:54 -08:00
Daniel Sandler
ec1f1f4cfc
Merge changes I674abfcc,Ia40f4c53 into honeycomb-mr1
...
* changes:
When the user touches a peeked notification, reset the fadeout timer.
Fix touches on glowing region around panel.
2011-03-07 10:47:13 -08:00
Gloria Wang
b8b6a9a8d4
To support uri started with http:// in some Java APIs
...
Fix for bug 4016388.
Change-Id: I9f6f449dca49eb03446bf6aa22b5dd467ca189c9
2011-03-07 10:41:41 -08:00
Winson Chung
397d1bff5d
am c7dcd70a: am d452dbc2: Merge "Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)" into honeycomb-mr1
...
* commit 'c7dcd70a7801438f62e28883b28b3f457055785a':
Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)
2011-03-07 10:27:50 -08:00
Adam Powell
e9e7b24bce
am 1c94feb0: am 9ab91b84: Merge "Fix bug 3509417 - Serialize touch event handling in webview" into honeycomb-mr1
...
* commit '1c94feb04f20c0c3e193746a6f413557f4d12a30':
Fix bug 3509417 - Serialize touch event handling in webview
2011-03-07 10:25:16 -08:00
Winson Chung
c7dcd70a78
am d452dbc2: Merge "Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)" into honeycomb-mr1
...
* commit 'd452dbc2b62a9ddf7558965404f69f9a5e4ad1f5':
Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)
2011-03-07 10:24:42 -08:00
Adam Powell
1c94feb04f
am 9ab91b84: Merge "Fix bug 3509417 - Serialize touch event handling in webview" into honeycomb-mr1
...
* commit '9ab91b843a82ccc853b78cc3c0f21c86e668418e':
Fix bug 3509417 - Serialize touch event handling in webview
2011-03-07 10:22:24 -08:00
Winson Chung
d452dbc2b6
Merge "Fixing issue where AppWidget service was being hit regardless of caching in RemoteViewsAdapter. (3467340)" into honeycomb-mr1
2011-03-07 10:21:11 -08:00
Adam Powell
9ab91b843a
Merge "Fix bug 3509417 - Serialize touch event handling in webview" into honeycomb-mr1
2011-03-07 10:20:23 -08:00
Jesse Wilson
dfed7c006a
Remove deprecated and unused entryEvicted method.
...
Change-Id: I30ccf3d798a3ebfc88a1b340efaaacf524d56fae
http://b/3461302
2011-03-07 09:07:07 -08:00
Jesse Wilson
27f4bd7a47
Merge "Remove deprecated and unused entryEvicted method."
2011-03-07 08:47:43 -08:00
Justin Ho
22b0451771
am ed16f582: am ef560044: Merge "SearchView textfield backgrounds for bracketing the submit/voice button and improve padding." into honeycomb-mr1
...
* commit 'ed16f58239f8a3f125d6ac340fae999fd1ecf633':
SearchView textfield backgrounds for bracketing the submit/voice button and improve padding.
2011-03-07 07:35:48 -08:00
Justin Ho
ed16f58239
am ef560044: Merge "SearchView textfield backgrounds for bracketing the submit/voice button and improve padding." into honeycomb-mr1
...
* commit 'ef56004420cd9f1cb84f22e20d649ba8f1791dea':
SearchView textfield backgrounds for bracketing the submit/voice button and improve padding.
2011-03-07 07:32:04 -08:00
Justin Ho
ef56004420
Merge "SearchView textfield backgrounds for bracketing the submit/voice button and improve padding." into honeycomb-mr1
2011-03-07 07:30:09 -08:00
Kristian Monsen
7b157166d8
am 6d7d68da: (-s ours) am 9f5f7af6: Deprecating webkit API\'s that might not be supported in the future do not merge
...
* commit '6d7d68da6c9508d0872912b4d5201efe571d8c19':
Deprecating webkit API's that might not be supported in the future do not merge
2011-03-07 05:19:11 -08:00
Kristian Monsen
6d7d68da6c
am 9f5f7af6: Deprecating webkit API\'s that might not be supported in the future do not merge
...
* commit '9f5f7af6ccaf14303c109bfd5b2605eac16c46c6':
Deprecating webkit API's that might not be supported in the future do not merge
2011-03-07 05:10:12 -08:00
Kristian Monsen
9f5f7af6cc
Deprecating webkit API's that might not be supported in the future do not merge
...
Change-Id: I7ed9498a24aceee529397bbe1ed96a15f834b4eb
2011-03-07 13:01:28 +00:00
Carl Shapiro
17cc33a357
Remove unused JNI global references.
...
Change-Id: Ie4886ab66538e293832c3bc3d6023e34304a2d21
2011-03-05 20:53:16 -08:00
Mike Lockwood
775de951a8
MTP: Use SharedPreferences for MTP device properties rather than sqlite3
...
sqlite3 is overkill for what we are doing here, and more fragile.
BUG: 3512856
Change-Id: I83d86127949d894a3887db3456d91b013060e852
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-05 17:34:11 -05:00
Xia Wang
f9ba136489
am 6b421e76: am 7d83f602: am 928ec5e0: Merge "Modify connectivity manager test suite so that it can be run on Wi-Fi only device." into honeycomb
...
* commit '6b421e76e9ee5c22cf2a785392b33a5024ee0051':
Modify connectivity manager test suite so that it can be run on Wi-Fi only device.
2011-03-05 09:31:58 -08:00
Scott Main
2b09abb717
am 4342be2b: am d75ff0e2: am fa331d0d: docs: update publishing doc to remove pname search parameter
...
* commit '4342be2bb3a38d76c5fab2eb199ef1e7e99d567a':
docs: update publishing doc to remove pname search parameter
2011-03-05 09:31:54 -08:00