ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,137 Commits 2 Branches 0 Tags 54 MiB
8cf167fd58
Commit Graph

19137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
8cf167fd58 am 95105f3c: am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode(). 
Merge commit '95105f3c25110f28b236cfa71e9ad74533eef854'

* commit '95105f3c25110f28b236cfa71e9ad74533eef854':
  Fix safe mode and KeyEvent.getMaxKeyCode().
 2010-08-10 16:39:10 -07:00
Jeff Brown
0c3746d3b9 am d3cf0544: am d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread 
Merge commit 'd3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab'

* commit 'd3cf0544cc7eec8ace3dc3b7fc17b7dac69e0aab':
  Optimize VelocityTracker to run in linear time.
 2010-08-10 16:38:58 -07:00
Jeff Brown
143c2a7aa7 am c3fc2d03: Fix safe mode and KeyEvent.getMaxKeyCode(). 
Merge commit 'c3fc2d03d58a258c53c9265a70143d4af076b764' into gingerbread-plus-aosp

* commit 'c3fc2d03d58a258c53c9265a70143d4af076b764':
  Fix safe mode and KeyEvent.getMaxKeyCode().
 2010-08-10 16:33:47 -07:00
Jeff Brown
49c57faad4 am d98d0fc6: Merge "Optimize VelocityTracker to run in linear time." into gingerbread 
Merge commit 'd98d0fc6e9172d3f130794e499462c911920adf6' into gingerbread-plus-aosp

* commit 'd98d0fc6e9172d3f130794e499462c911920adf6':
  Optimize VelocityTracker to run in linear time.
 2010-08-10 16:31:04 -07:00
Jeff Brown
8d4dfd25f7 Fix safe mode and KeyEvent.getMaxKeyCode(). 
Bug: 2901731
Change-Id: I78617c1b9dee3790fc590e5af4b5083368873184
 2010-08-10 16:28:03 -07:00
Jeff Brown
81a5c091ca Merge "Optimize VelocityTracker to run in linear time." into gingerbread 2010-08-10 16:26:56 -07:00
Kenny Root
7959ed7751 am a27484f0: am 6061af11: Merge "Sort the IME list before showing to user" 
Merge commit 'a27484f068047453af6345f2c2c58fcc1db899a5'

* commit 'a27484f068047453af6345f2c2c58fcc1db899a5':
  Sort the IME list before showing to user
 2010-08-10 15:47:27 -07:00
Kenny Root
66f8d47734 am 6061af11: Merge "Sort the IME list before showing to user" 
Merge commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7' into gingerbread-plus-aosp

* commit '6061af11cb2b59b6261d12f98b9e8dd395ea8ba7':
  Sort the IME list before showing to user
 2010-08-10 15:38:41 -07:00
Adam Powell
2b118e72e5 Merge "Fix bug 2888333" 2010-08-10 15:35:10 -07:00
Kenny Root
baa71ee642 Merge "Sort the IME list before showing to user" 2010-08-10 15:22:13 -07:00
Adam Cohen
a9af99c428 Merge "Preliminary implementation of StackView, which extends AdapterViewAnimator." 2010-08-10 15:10:59 -07:00
Romain Guy
d7be93f92f Merge "Fast text selection drawing." 2010-08-10 14:59:18 -07:00
Andreas Huber
6d814677a0 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
Andreas Huber
eb37a6ff7b 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
d74731ce8d Merge "Remove some obsolete code." into gingerbread 2010-08-10 14:09:39 -07:00
Mathias Agopian
5d708a5916 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
14a4443344 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
4b149a598f Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread 2010-08-10 13:50:22 -07:00
James Dong
b8b131f293 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
0f1c0ec93b 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
166638b737 Merge "Add input buffer size check for software video encoders" into gingerbread 2010-08-10 13:27:09 -07:00
Andreas Huber
4de258b630 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
394f27dafd 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
dd05839d2d 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
0155075618 Merge "Fix tons of bugs and add new text rendering support." 2010-08-10 12:23:49 -07:00
Nipun Kwatra
0b17d20fa4 Merge "use usleep instead of sleep." 2010-08-10 12:22:13 -07:00
Romain Guy
761eaed2ff Fix tons of bugs and add new text rendering support. 
Change-Id: I326c66b10784006f6df2f12d38e120cef94cd0d7
 2010-08-10 12:22:01 -07:00
Eric Fischer
04096ae085 Merge "Import revised translations." 2010-08-10 12:18:50 -07:00
Mike Lockwood
6bc399f93b Merge "MTP: Fix wrong delete operator from previous change." 2010-08-10 12:13:23 -07:00
Eric Fischer
32df7de29b 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
2744dbf11c 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
20e38dfac6 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
2ea2fc590c 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
ca71562968 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-08-10 11:54:24 -07:00
Eric Rowe
16f0555ca3 am 301c437b: Remove @LargeTest annotations 
Merge commit '301c437b554e2152f3f6fffadc680f5cbf8e8231' into gingerbread

* commit '301c437b554e2152f3f6fffadc680f5cbf8e8231':
  Remove @LargeTest annotations
 2010-08-10 11:53:59 -07:00
Andreas Huber
973f5bf33a 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
3252c99110 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
73310bca96 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
Ben Dodson
7b910c35d0 Merge "Updated error codes for Doclava migration" 2010-08-10 11:26:48 -07:00
Chet Haase
acec485bf3 Merge "Add 3D rotation to View" 2010-08-10 11:01:42 -07:00
James Dong
dfb23d7213 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
b084d125e6 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
James Dong
c4d25e70d6 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
Brett Chabot
f2398fd064 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
a45a550667 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
c3e4612796 Merge "Fix gingerbread FrameworkCoreTests makefile." into gingerbread 2010-08-10 10:27:48 -07:00
Maksymilian Osowski
e22e348d5e Merge "Changed some parts of the code to prepare it for script support that will come in later commit." 2010-08-10 07:42:47 -07:00
Mike Lockwood
4f5bb6cbd6 Merge changes I4f117090,Ifd449c4e 
* changes:
  MTP: Push queries for supported formats and properties up to Java.
  MTP: turn off verbose logging
 2010-08-10 06:13:35 -07:00
Maksymilian Osowski
d6ea51f345 Merge "Added generating text summary to Summarizer." 2010-08-10 05:41:40 -07:00
Hung-ying Tyan
c6da60c690 am f13542f2: am 259b4c86: Merge "SIP: clean up unused class and fields." into gingerbread 
Merge commit 'f13542f2eba27d9b09ba6aa313f758e5518caa00'

* commit 'f13542f2eba27d9b09ba6aa313f758e5518caa00':
  SIP: clean up unused class and fields.
 2010-08-09 22:44:37 -07:00