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

28230 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
a674ab74e3 Add support for text underline and strikethru. 
Change-Id: I3a0e6643d7cafbdd06d9a908c8cf9347dcaba146
 2010-08-10 17:26:42 -07:00
Romain Guy
7a70374606 Merge "Fast text selection drawing." 2010-08-10 14:59:18 -07:00
Romain Guy
a48a1a87ba Fast text selection drawing. 
Change-Id: I93fb1312b47bc05345defa9b6cfe47c0658bb329
 2010-08-10 14:59:15 -07:00
Andreas Huber
a774765686 am d35498f6: am 1a140bf6: Merge "Remove some obsolete code." into gingerbread 
Merge commit 'd35498f6062410e777d6ad41a720db32336e2089'

* commit 'd35498f6062410e777d6ad41a720db32336e2089':
  Remove some obsolete code.
 2010-08-10 14:21:32 -07:00
Jeff Hamilton
b721b47811 Add a constructor from CursorAdapter to ResourceCursorAdapter. 
Change-Id: I423bab1907c24a718a8575d5cbe0cee0e5e4968e
 2010-08-10 16:17:09 -05:00
Andreas Huber
d35498f606 am 1a140bf6: Merge "Remove some obsolete code." into gingerbread 
Merge commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5' into gingerbread-plus-aosp

* commit '1a140bf65c288fcb1458bbd694c9d6e7a567a0f5':
  Remove some obsolete code.
 2010-08-10 14:15:11 -07:00
Andreas Huber
1a140bf65c Merge "Remove some obsolete code." into gingerbread 2010-08-10 14:09:39 -07:00
Mathias Agopian
036b07cc28 am 553a333d: am 603a34ee: Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread 
Merge commit '553a333d4446bb34330da92f02daa515dc597939'

* commit '553a333d4446bb34330da92f02daa515dc597939':
  improve a bit the implementation of eglGetProcAddress
 2010-08-10 13:55:34 -07:00
Mathias Agopian
553a333d44 am 603a34ee: Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread 
Merge commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf' into gingerbread-plus-aosp

* commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf':
  improve a bit the implementation of eglGetProcAddress
 2010-08-10 13:52:58 -07:00
Mathias Agopian
603a34ee30 Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread 2010-08-10 13:50:22 -07:00
Andreas Huber
6fa131105d Remove some obsolete code. 
Change-Id: Ic4d21afe3721173d48db44b8ee4f836deee017ad
 2010-08-10 13:48:53 -07:00
James Dong
c3f20251eb am b9ddd779: am 10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread 
Merge commit 'b9ddd779ae547b020764b89a0cbd96d589717609'

* commit 'b9ddd779ae547b020764b89a0cbd96d589717609':
  Add input buffer size check for software video encoders
 2010-08-10 13:32:40 -07:00
James Dong
b9ddd779ae am 10ed3f74: Merge "Add input buffer size check for software video encoders" into gingerbread 
Merge commit '10ed3f7438f6ae797bac32476dc61465c6484c85' into gingerbread-plus-aosp

* commit '10ed3f7438f6ae797bac32476dc61465c6484c85':
  Add input buffer size check for software video encoders
 2010-08-10 13:28:56 -07:00
James Dong
10ed3f7438 Merge "Add input buffer size check for software video encoders" into gingerbread 2010-08-10 13:27:09 -07:00
Andreas Huber
3965148396 am 4dc41bb4: am 18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbrea 
Merge commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28'

* commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28':
  We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
 2010-08-10 13:04:42 -07:00
Andreas Huber
4dc41bb445 am 18f0174f: Merge "We\'re now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread 
Merge commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48' into gingerbread-plus-aosp

* commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48':
  We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
 2010-08-10 13:01:58 -07:00
Andreas Huber
18f0174ff4 Merge "We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup." into gingerbread 2010-08-10 12:59:27 -07:00
Romain Guy
623ee2a569 Merge "Fix tons of bugs and add new text rendering support." 2010-08-10 12:23:49 -07:00
Nipun Kwatra
f5e9018b80 Merge "use usleep instead of sleep." 2010-08-10 12:22:13 -07:00
Romain Guy
61c8c9c5b2 Fix tons of bugs and add new text rendering support. 
Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
 2010-08-10 12:22:01 -07:00
Eric Fischer
8c9d61c459 Merge "Import revised translations." 2010-08-10 12:18:50 -07:00
Mike Lockwood
e75504d2c7 Merge "MTP: Fix wrong delete operator from previous change." 2010-08-10 12:13:23 -07:00
Mike Lockwood
33ea5a4e86 MTP: Fix wrong delete operator from previous change. 
Change-Id: I64e8fdc610495f21060727b6bed42d1584833405
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-10 15:11:32 -04:00
Eric Fischer
28269e91d1 Import revised translations. 
Change-Id: Idaaed3b13133d531dfd6055809c66df3fba250bb
 2010-08-10 12:10:18 -07:00
Nipun Kwatra
7913998c4b use usleep instead of sleep. 
Minor bugfix. sleep doesn't take fractional value for seconds, so use
usleep instead of sleep for sleeping small times.

Change-Id: I40e45c30cc595a54c18601117b9a1a3637652f60
 2010-08-10 12:08:17 -07:00
Eric Fischer
0dd8798e32 am c7af4c5c: (-s ours) am 605f4027: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit 'c7af4c5c5aff84fc70ac4d6e1547197d56a9ee9a'

* commit 'c7af4c5c5aff84fc70ac4d6e1547197d56a9ee9a':
  Import revised translations.  DO NOT MERGE
 2010-08-10 12:04:09 -07:00
Eric Rowe
542cf2c9cf am 7cb0fc58: am edae848e: am 301c437b: Remove @LargeTest annotations 
Merge commit '7cb0fc588042f7642f13ea2cc404eae04bd5509a'

* commit '7cb0fc588042f7642f13ea2cc404eae04bd5509a':
  Remove @LargeTest annotations
 2010-08-10 12:04:04 -07:00
Eric Fischer
c7af4c5c5a am 605f4027: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
Merge commit '605f402796afa9c88e2f91284e98d1f59a0726aa' into gingerbread-plus-aosp

* commit '605f402796afa9c88e2f91284e98d1f59a0726aa':
  Import revised translations.  DO NOT MERGE
 2010-08-10 12:00:12 -07:00
Eric Rowe
7cb0fc5880 am edae848e: am 301c437b: Remove @LargeTest annotations 
Merge commit 'edae848eb62e27b8e987aa89557d1456304fada7' into gingerbread-plus-aosp

* commit 'edae848eb62e27b8e987aa89557d1456304fada7':
  Remove @LargeTest annotations
 2010-08-10 12:00:07 -07:00
Eric Fischer
605f402796 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-10 11:54:24 -07:00
Eric Rowe
edae848eb6 am 301c437b: Remove @LargeTest annotations 
Merge commit '301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread

* commit '301c437b554e2152f3f6fffadc680f5cbf8e8231':
  Remove @LargeTest annotations
 2010-08-10 11:53:59 -07:00
Eric Fischer
06a43dcf48 Import revised translations. DO NOT MERGE 
Change-Id: I24dd4ee2c61694e917db02c92396134df65c0218
 2010-08-10 11:50:15 -07:00
Andreas Huber
ac4bbc2e18 am 193985ff: am 235be391: Merge "Many, many developers misread or don\'t read the http specs and terminate lines with \'\n\' instead of CRLF \'\r\n\' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into ginger 
Merge commit '193985ffd553c139e8c1094d7798edbe5b0797c5'

* commit '193985ffd553c139e8c1094d7798edbe5b0797c5':
  Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
 2010-08-10 11:47:04 -07:00
Andreas Huber
193985ffd5 am 235be391: Merge "Many, many developers misread or don\'t read the http specs and terminate lines with \'\n\' instead of CRLF \'\r\n\' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread 
Merge commit '235be391f3b9cd79e525de87757e361ae044940d' into gingerbread-plus-aosp

* commit '235be391f3b9cd79e525de87757e361ae044940d':
  Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
 2010-08-10 11:45:01 -07:00
Andreas Huber
235be391f3 Merge "Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs." into gingerbread 2010-08-10 11:39:38 -07:00
Andreas Huber
f88f84414a We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup. 
Change-Id: Idc3df74b42000f7a6aa3eae090718dc9d9c4186f
 2010-08-10 11:38:18 -07:00
Ben Dodson
926bd956d6 Merge "Updated error codes for Doclava migration" 2010-08-10 11:26:48 -07:00
Chet Haase
8cc82c6f48 Merge "Add 3D rotation to View" 2010-08-10 11:01:42 -07:00
James Dong
898d5cdda2 am a0488341: am 532d2ac5: Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread 
Merge commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990'

* commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990':
  Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
 2010-08-10 10:48:59 -07:00
James Dong
e6daea5940 Add input buffer size check for software video encoders 
Change-Id: I03953a1245060ed6656a965e1a8a61386126c441
 2010-08-10 10:46:11 -07:00
James Dong
a04883412e am 532d2ac5: Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread 
Merge commit '532d2ac5d5c06c3938c4999238d1051207bfe53c' into gingerbread-plus-aosp

* commit '532d2ac5d5c06c3938c4999238d1051207bfe53c':
  Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
 2010-08-10 10:44:25 -07:00
Ben Dodson
3fbe150d36 Updated error codes for Doclava migration 
Change-Id: Id8e8d0a47ae863cbdfb56569860fc0f56c644e97
 2010-08-10 10:42:21 -07:00
James Dong
532d2ac5d5 Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread 2010-08-10 10:41:29 -07:00
Chet Haase
fd2b002bcf Add 3D rotation to View 
Change-Id: I4aa2542eb821e82d44e13d69b0938de13ffd4f0d
 2010-08-10 10:36:21 -07:00
Brett Chabot
7c997d209b am 4f941812: am e967ee49: Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread 
Merge commit '4f94181282e7f23d19a5fcab5f1b93d6d52e7715'

* commit '4f94181282e7f23d19a5fcab5f1b93d6d52e7715':
  Fix gingerbread FrameworkCoreTests makefile.
 2010-08-10 10:34:00 -07:00
Brett Chabot
4f94181282 am e967ee49: Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread 
Merge commit 'e967ee49b5a86de2be11dd1d28283c337b01e537' into gingerbread-plus-aosp

* commit 'e967ee49b5a86de2be11dd1d28283c337b01e537':
  Fix gingerbread FrameworkCoreTests makefile.
 2010-08-10 10:30:32 -07:00
Brett Chabot
e967ee49b5 Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread 2010-08-10 10:27:48 -07:00
James Dong
f3b7859fc9 Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer 
o Assume there is only a single output buffer containing such information.
  This simplifies the logic in MP4 file writer

o Output SPS and PPS in the very first buffer for software AVC encoder
  This is to make AVC encoder work with the MP4 file writer

o Add timestamp value for codec config data

Change-Id: Iad27a04579e6028332429cd0bebd30976041e997
 2010-08-10 10:20:15 -07:00
Andreas Huber
aa92ef7a56 Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs. 
Change-Id: I51df3b8139b3009565b2271611050700a23cf1d7
 2010-08-10 10:10:40 -07:00
Jeff Hamilton
f0cfe3438a Add a few helpful APIs. 
Change-Id: Ie57aa71eb77a1e0fb058f4eb6f40d4144a6dfce7
 2010-08-10 10:13:18 -05:00