drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,021 Commits 1 Branch 0 Tags
Commit Graph

45021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Basavapatna Dattaguru
fc04c1d67e VideoEditor: Issue ID:3396697 Missing Files added 
IMG_640x480_Overlay2: dimension correction done

Change-Id: I40960a44584fb27538d7e22829d293a34c654df7
 2011-02-13 16:54:51 -08:00
Basavapatna Dattaguru
b27a1ca53e Merge "VideoEditor: Fixes Issue ID:3448077" 2011-02-11 18:11:21 -08:00
Basavapatna Dattaguru
4eb7a98342 VideoEditor: Fixes Issue ID:3448077 
Updated with review comments. checks width & height

Change-Id: I79bd28862f511e7653e7e7a63c88772834ee6559
 2011-02-11 18:03:01 -08:00
Basavapatna Dattaguru
656055866a Merge "VideoEditor: Populate profile&level: Issue:3419090" 2011-02-11 17:48:45 -08:00
Basavapatna Dattaguru
2b06e56031 VideoEditor: Populate profile&level: Issue:3419090 
Updated with new values for Profiles and levels

Change-Id: Ib0abcab1be741c151ce44b54eb1deff64828af00
 2011-02-11 17:18:54 -08:00
Vasu Nori
c5d0fbbfdf Merge "add more debug info to help (bug:3446432)" 2011-02-11 16:57:40 -08:00
Eric Laurent
bdedbc7e3c Merge "Fix issue 3400751." 2011-02-11 16:54:48 -08:00
Vasu Nori
e9714e6c74 add more debug info to help (bug:3446432) 
Change-Id: I4a690297ae7f18d5f6928ac5c67d8d4164453fa0
 2011-02-11 16:50:51 -08:00
Stephen Hines
1243354542 am e49f75eb: am bbcf2079: Merge "Fix struct initializer for balls." into honeycomb 
* commit 'e49f75eb4634f8ee70ad0b5fbd8c6ea19773024f':
  Fix struct initializer for balls.
 2011-02-11 16:49:48 -08:00
Roman Nurik
5559d6a4c6 am 471f89cc: am b9659336: Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb 
* commit '471f89cc8666f484c5a609503f16d806b8c716f0':
  Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.
 2011-02-11 16:47:34 -08:00
Stephen Hines
e49f75eb46 am bbcf2079: Merge "Fix struct initializer for balls." into honeycomb 
* commit 'bbcf2079e9978ad6f75732070ce1dcc0dea3ea3f':
  Fix struct initializer for balls.
 2011-02-11 16:47:04 -08:00
Roman Nurik
471f89cc86 am b9659336: Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb 
* commit 'b9659336c24ee9be8041132f0d9a1bca3ff6ed36':
  Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.
 2011-02-11 16:44:52 -08:00
Stephen Hines
bbcf2079e9 Merge "Fix struct initializer for balls." into honeycomb 2011-02-11 16:44:49 -08:00
Roman Nurik
b9659336c2 Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb 2011-02-11 16:43:32 -08:00
Stephen Hines
7655a7dd1d Fix struct initializer for balls. 
Bug: 3092382
Change-Id: Ie4e85177727b32f0a260fae53885c97bee111343
 2011-02-11 16:38:46 -08:00
Robert Ly
5955592d0f am 154e849b: am ccea5d27: Doc change: tools, adt, ndk release notes 
* commit '154e849b72f6c71ee4c996b6dc67a46e7f8703df':
  Doc change: tools, adt, ndk release notes
 2011-02-11 16:31:59 -08:00
Robert Ly
154e849b72 am ccea5d27: Doc change: tools, adt, ndk release notes 
* commit 'ccea5d27d37636db2669abec8a854fbd923440da':
  Doc change: tools, adt, ndk release notes
 2011-02-11 16:30:15 -08:00
Robert Ly
ccea5d27d3 Doc change: tools, adt, ndk release notes 
Change-Id: I83f03b193995450f694e5f638bdb4a2cf90c0bdd
 2011-02-11 16:19:55 -08:00
Yu Shan Emily Lau
4d0e920c4f Merge "Add the open source test media contents." 2011-02-11 16:16:06 -08:00
Jesse Wilson
05ab441afc Merge "Add a new method, LruCache.remove" 2011-02-11 15:56:15 -08:00
Jesse Wilson
56b6ad3e28 Add a new method, LruCache.remove 
Change-Id: Iae78a2ed4d719d4f14a4677ecb6fe5bc823bb660
http://b/3184897
 2011-02-11 15:54:28 -08:00
Yu Shan Emily Lau
bd508bdbe4 Add the open source test media contents. 
Change-Id: I956e06712454287f502bffb22e10612e980b936d
 2011-02-11 15:47:00 -08:00
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
d0545f5334 Fix issue 3400751. 
Add a delay before restoring output path when a notification ends so that
short sounds can be heard on proper device before the path is actualy switched.

Change-Id: I1d2dd8e7e28e15fbcab344256f88499b26297372
 2011-02-11 14:53:23 -08:00
Eric Laurent
eab7b0bbb4 Merge "Fix issue 3425342." 2011-02-11 14:48:20 -08:00
Roman Nurik
7641db4b3e Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations. 
Change-Id: I905213a47c9da0476e8495ffa20344a8811d56bc
 2011-02-11 14:42:17 -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