Roman Nurik
231afcfa5d
am d822438f: am 94be4a5e: Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
...
* commit 'd822438fa7fcc23df3a240a65ad4ba1fe6fe7cc7':
Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
2011-02-11 15:44:46 -08:00
Roman Nurik
d822438fa7
am 94be4a5e: Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
...
* commit '94be4a5e1ad833d7e5d0dbed29b806ba8fd5409e':
Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
2011-02-11 15:42:57 -08:00
James Dong
ffbd592d6c
Merge "Make available h263 DSI information from MPEG4Extractor"
2011-02-11 15:38:20 -08:00
Adam Cohen
b9d3e5ec93
am c7f15f5c: am 5a1b6357: Merge "Adding StackWidget sample code" into honeycomb
...
* commit 'c7f15f5cbb68e138e739f6e6d7e1605c48cad2a4':
Adding StackWidget sample code
2011-02-11 15:29:43 -08:00
Winson Chung
2fc779eaeb
am 40683904: am 5f3cd3ea: Merge "Associated changes for \'Adding sample for collection widgets backed by content providers.\'" into honeycomb
...
* commit '4068390434c366b814dc0885ae5ef5fc0cf50eff':
Associated changes for 'Adding sample for collection widgets backed by content providers.'
2011-02-11 15:29:35 -08:00
James Dong
fe84cf13cd
Make available h263 DSI information from MPEG4Extractor
...
bug - 3446863
Change-Id: Idbaf7a564d544784fdbc36ed0339c98a519adc88
2011-02-11 15:25:03 -08:00
Adam Cohen
c7f15f5cbb
am 5a1b6357: Merge "Adding StackWidget sample code" into honeycomb
...
* commit '5a1b63572bf52142aa880cccc92636e65600bb60':
Adding StackWidget sample code
2011-02-11 15:23:27 -08:00
Roman Nurik
94be4a5e1a
Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.
...
Change-Id: I0b98cf639a0c52343290227291620c88fd260774
2011-02-11 15:21:49 -08:00
Adam Cohen
5a1b63572b
Merge "Adding StackWidget sample code" into honeycomb
2011-02-11 15:19:38 -08:00
Basavapatna Dattaguru
4c030b5616
Merge "Video Editor CTS Test Code: annotation suppress"
2011-02-11 15:17:06 -08:00
Winson Chung
4068390434
am 5f3cd3ea: Merge "Associated changes for \'Adding sample for collection widgets backed by content providers.\'" into honeycomb
...
* commit '5f3cd3eabb7bcf8a293f84e84b0acbef682d3c88':
Associated changes for 'Adding sample for collection widgets backed by content providers.'
2011-02-11 15:15:33 -08:00
Basavapatna Dattaguru
e69ce38903
Merge "VideoEditor Test contents: Issue ID:3396697"
2011-02-11 15:08:28 -08:00
Winson Chung
5f3cd3eabb
Merge "Associated changes for 'Adding sample for collection widgets backed by content providers.'" into honeycomb
2011-02-11 15:07:06 -08:00
Basavapatna Dattaguru
31d19c80c7
VideoEditor Test contents: Issue ID:3396697
...
Moved to folder contents/media_api/videoeditor
Change-Id: I809b684931130badca1c5bbf91178b142ba5017f
2011-02-11 15:00:17 -08:00
Eric Laurent
eab7b0bbb4
Merge "Fix issue 3425342."
2011-02-11 14:48:20 -08:00
Eric Laurent
ee5d4b8fc4
Fix issue 3425342.
...
Change the device selection order as follows to enable easier use of
A2DP while the device is docked:
1 - wired Headset
2 - A2DP Headset
3 - SPDIF/HDMI
4 - Dock
Also do not limit notifications volume when on dock.
Change-Id: I55ea6bea9f2d9ff284b54023e541b2788d0f1eb8
2011-02-11 14:42:13 -08:00
Robert Ly
b3103093a4
am 65bdc59e: resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp
...
* commit '65bdc59ea0e5c1cbc97ea2b288b71d48de173a79':
Doc change: nfc dev guide
2011-02-11 14:02:00 -08:00
Xia Wang
cbafbe7c3e
Merge "Fix test3GToWifiNotification for mobile state validation."
2011-02-11 13:55:44 -08:00
Andreas Huber
990909242c
Merge "Start playing (and decoding) audio only after the first video frame has been decoded."
2011-02-11 13:50:12 -08:00
Robert Ly
65bdc59ea0
resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp
...
Conflicts:
docs/html/guide/guide_toc.cs
Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2
2011-02-11 13:49:09 -08:00
Basavapatna Dattaguru
86e9e9be1e
Video Editor CTS Test Code: annotation suppress
...
Fix for Issue: ID:3396697
Updated with review comments
Change-Id: Ie20e60598f046b23ed49b2533e9d500607a23c17
2011-02-11 13:30:07 -08:00
Robert Ly
c53349f6f2
am 6059bb3e: am 2be58282: Merge "Doc change: updating animation framework topic" into honeycomb
...
* commit '6059bb3e24bf47c3bfd805c887775db817d537e7':
Doc change: updating animation framework topic
2011-02-11 13:21:47 -08:00
Robert Ly
3e7a131c6b
am 41d34195: am 997a6713: Merge "Doc change: renderscript dev guide" into honeycomb
...
* commit '41d34195f9d0c6a1548bb9c0de27a8cfd147210f':
Doc change: renderscript dev guide
2011-02-11 13:21:44 -08:00
Robert Ly
6059bb3e24
am 2be58282: Merge "Doc change: updating animation framework topic" into honeycomb
...
* commit '2be58282746de92773f6423d4ae55a2ef4e5f226':
Doc change: updating animation framework topic
2011-02-11 13:18:41 -08:00
Robert Ly
41d34195f9
am 997a6713: Merge "Doc change: renderscript dev guide" into honeycomb
...
* commit '997a671368c3b9f66f3a415876aaa94b391ab602':
Doc change: renderscript dev guide
2011-02-11 13:18:33 -08:00
Robert Ly
810c1c0c35
am 322891c6: Doc change: nfc dev guide
...
* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
Doc change: nfc dev guide
2011-02-11 13:18:31 -08:00
Robert Ly
2be5828274
Merge "Doc change: updating animation framework topic" into honeycomb
2011-02-11 13:15:55 -08:00
Robert Ly
997a671368
Merge "Doc change: renderscript dev guide" into honeycomb
2011-02-11 13:15:35 -08:00
Andreas Huber
ce8a1013f3
Start playing (and decoding) audio only after the first video frame has been decoded.
...
if there's both audio and video content. This gives the video decoder an opportunity
to fill its internal buffer queue at the start of playback.
Change-Id: Ib2c95753b430e4e47207953b913b607024a328d7
related-to-bug: 3431702
2011-02-11 13:09:36 -08:00
Jesse Wilson
98e930a614
Merge "Remove LruCache.setMaxSize()."
2011-02-11 12:45:29 -08:00
James Dong
6ca23a624c
am d24d00ae: am f9e7442a: Update sample code in documentation
...
* commit 'd24d00ae1c0eaa20ec9f8581be4baba723ea4a00':
Update sample code in documentation
2011-02-11 12:00:14 -08:00
James Dong
d24d00ae1c
am f9e7442a: Update sample code in documentation
...
* commit 'f9e7442a0c0c7efc70d13fa9330baa797316154a':
Update sample code in documentation
2011-02-11 11:56:33 -08:00
Robert Greenwalt
614613e2d2
Merge "Update LinkProperties treatment of gateways"
2011-02-11 11:38:44 -08:00
Jesse Wilson
dfe515e49a
Remove LruCache.setMaxSize().
...
Dynamically changing a max cache size is clumsy; almost everyone
should set this when they create the cache.
Fix SQLiteDatabase to copy entries into a new cache when the size
is changed. In pratice this will always be immediately after the
SQLiteDatabase is created. Since the cache field is no longer
final, change the guard on the cache field to the SQLiteDatabase
instance itself.
Change-Id: I4e325f06edc551636723568a52770c0982e2d945
2011-02-11 11:35:22 -08:00
Santosh Madhava
9ee9aad809
Fix for issue 3444358 : Movie studio is broken in Master-TOT
...
Change-Id: Ie83703a5da6587a6b5668bc4777fdba71042b2bc
2011-02-11 11:34:26 -08:00
Winson Chung
06d2fa705b
Associated changes for 'Adding sample for collection widgets backed by content providers.'
...
Change-Id: Ic872675f4645497dd1478b6c7e3074b029ea66ad
2011-02-11 11:27:23 -08:00
Robert Greenwalt
992564e481
Update LinkProperties treatment of gateways
...
A link can have multiple gateways (think ipv4/ipv6 for a trivial example).
.
bug:3438810
Change-Id: I28c90a6947cd50b82e5ca9a0113148f98b3f4dd8
2011-02-11 11:06:23 -08:00
Dheeraj Sharma
1d830165a0
Merge "Fix for issue : 3439708 Last frame is missing effect"
2011-02-11 10:57:31 -08:00
Amith Yamasani
cfd2eb0f2e
Merge "Fix over-eager locking of volume dialog's primary stream."
2011-02-11 10:42:56 -08:00
Jean-Baptiste Queru
da083c3b15
am 0ba97e3f: am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs"
...
* commit '0ba97e3ff830e3f6045650e0a4bd0d08dad50fcc':
stubs
2011-02-11 10:33:58 -08:00
Jean-Baptiste Queru
0ba97e3ff8
am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs"
...
* commit '6d104f118a59e276eb577ae322f29c2ff8a5015a':
stubs
2011-02-11 10:16:45 -08:00
Jean-Baptiste Queru
6d104f118a
am 6901f963: am 93552de8: Merge "stubs"
...
* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
stubs
2011-02-11 10:04:53 -08:00
Leon Scroggins
2b24957d67
Merge "Do not show the dropdown unless there is something to show."
2011-02-11 09:58:05 -08:00
Jean-Baptiste Queru
6901f963c2
am 93552de8: Merge "stubs"
...
* commit '93552de8e305027fb003401e347b9493c64c981f':
stubs
2011-02-11 09:54:59 -08:00
Jean-Baptiste Queru
93552de8e3
Merge "stubs"
2011-02-11 09:39:46 -08:00
Steve Block
1da970625c
stubs
...
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
2011-02-11 09:33:40 -08:00
Leon Scroggins
03e0119c93
Do not show the dropdown unless there is something to show.
...
Bug:3427152
Change-Id: I2f0c36193f762085c2e1e7036387ff04f6f259d0
2011-02-11 10:19:22 -05:00
Mike Lockwood
540380fb0a
Add MTP/PTP host support to the public API
...
Needed for unbundling the Gallery app
Change-Id: I57e6b76ee5c9e57cb8c055329ac13251879baafd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-11 09:09:11 -05:00
Mike Lockwood
bc20c93863
Merge "MTP: Fix JNI warnings in MtpDevice"
2011-02-11 05:21:26 -08:00
Mike Lockwood
40304e2272
MTP: Fix JNI warnings in MtpDevice
...
Needed to add a global ref to the classse to avoid
"not a valid JNI reference" errors when calling the constructor.
Change-Id: Ieb7e69f5d19fd5a090c53d32f69a201040c49112
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-11 08:19:11 -05:00