ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
21,592 Commits 2 Branches 0 Tags 54 MiB
6f0fe65008
Commit Graph

21592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Onorato
6f0fe65008 Merge "Merge commit '00cb6417' into master. Doesn't turn on the debugging." 2010-09-23 17:22:43 -07:00
Joe Onorato
59195a1dd5 Merge commit '00cb6417' into master. Doesn't turn on the debugging. 
Change-Id: I1d4db9c5256ba45a44e50e8229b895e2e5330690
 2010-09-23 17:05:09 -07:00
Stephen Hines
b8ffcbcbb0 Merge "Add RsList implementation to RSTest." 2010-09-23 16:43:36 -07:00
Romain Guy
6fd9f7e0d0 Merge "Add drawing profiling to the HardwareRenderer." 2010-09-23 16:34:05 -07:00
Romain Guy
2e56374b4d Merge "Don't clip alpha layers if the flag is not set." 2010-09-23 16:18:32 -07:00
Bill Napier
58b49ea862 Merge "Fix up some issues with the onCreateContextMenu example in the Notepad tutorial." 2010-09-23 16:17:11 -07:00
Amith Yamasani
6f3bb15c6d Merge "Fix for Ringtones not being saved when using Preference fragments." 2010-09-23 16:07:20 -07:00
Joe Onorato
0f0aa366c9 am f9ec03c0: Make the logging a little more targeted for the status bar multiple icon problem. 
Merge commit 'f9ec03c0f5fc2c6eba5bbead24c4eb314c0205be' into gingerbread-plus-aosp

* commit 'f9ec03c0f5fc2c6eba5bbead24c4eb314c0205be':
  Make the logging a little more targeted for the status bar multiple icon problem.
 2010-09-23 15:41:28 -07:00
Dirk Dougherty
9f89c835bf am 85662b8e: am f356c4bb: Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread 
Merge commit '85662b8e4f69b0e6d9a04084d4e2354fb8eecad5'

* commit '85662b8e4f69b0e6d9a04084d4e2354fb8eecad5':
  Doc change: ADT 0.9.9 version notes, size/sum update.
 2010-09-23 15:04:43 -07:00
Dirk Dougherty
d76fcd8108 am f356c4bb: Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread 
Merge commit 'f356c4bb3b19786555ceed8a1dbc824aac742d1b' into gingerbread-plus-aosp

* commit 'f356c4bb3b19786555ceed8a1dbc824aac742d1b':
  Doc change: ADT 0.9.9 version notes, size/sum update.
 2010-09-23 15:00:59 -07:00
Dirk Dougherty
f12e928701 Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread 2010-09-23 14:58:41 -07:00
Jeff Brown
3a2acce6a4 am 27917946: am de04fb0a: Merge "Enforce serial ordering of MotionEvents." into gingerbread 
Merge commit '279179461edccaa4217fe752a9abf6fcc2efa5a1'

* commit '279179461edccaa4217fe752a9abf6fcc2efa5a1':
  Enforce serial ordering of MotionEvents.
 2010-09-23 14:57:14 -07:00
Jeff Brown
94d1a120da am de04fb0a: Merge "Enforce serial ordering of MotionEvents." into gingerbread 
Merge commit 'de04fb0a0366057028369eb3b3efcb75367f74db' into gingerbread-plus-aosp

* commit 'de04fb0a0366057028369eb3b3efcb75367f74db':
  Enforce serial ordering of MotionEvents.
 2010-09-23 14:53:52 -07:00
Jeff Brown
3b8eb3ffb7 Merge "Enforce serial ordering of MotionEvents." into gingerbread 2010-09-23 14:51:52 -07:00
Kenny Root
599ec67bee am 2b1ffce1: am 7f459df9: Merge "Better errors in PackageManagerTests" into gingerbread 
Merge commit '2b1ffce18301ae051a70a85254133c29b9381593'

* commit '2b1ffce18301ae051a70a85254133c29b9381593':
  Better errors in PackageManagerTests
 2010-09-23 14:34:55 -07:00
Kenny Root
523f50f009 am 7f459df9: Merge "Better errors in PackageManagerTests" into gingerbread 
Merge commit '7f459df9f94bc52e53d42894dea4702394fbad5c' into gingerbread-plus-aosp

* commit '7f459df9f94bc52e53d42894dea4702394fbad5c':
  Better errors in PackageManagerTests
 2010-09-23 14:31:06 -07:00
Kenny Root
8aa24c202f Merge "Better errors in PackageManagerTests" into gingerbread 2010-09-23 14:27:00 -07:00
Andreas Huber
e0242ff1ec am 13770dcc: am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data \'avcC\' accordingly." into gingerbread 
Merge commit '13770dcce2cc1b4268ba092b59bc5a4c049f3a33'

* commit '13770dcce2cc1b4268ba092b59bc5a4c049f3a33':
  Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.
 2010-09-23 14:25:28 -07:00
Dianne Hackborn
ef0f5e1e61 am 2983e038: am 045398e6: Merge "Fix a deadlock I ran into." into gingerbread 
Merge commit '2983e038d189a257f1e5abb9c120bd1feb253773'

* commit '2983e038d189a257f1e5abb9c120bd1feb253773':
  Fix a deadlock I ran into.
 2010-09-23 14:20:48 -07:00
Andreas Huber
99b6ac3c6f am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data \'avcC\' accordingly." into gingerbread 
Merge commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275' into gingerbread-plus-aosp

* commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275':
  Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.
 2010-09-23 14:20:08 -07:00
Dianne Hackborn
ac86d33e1d am 045398e6: Merge "Fix a deadlock I ran into." into gingerbread 
Merge commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70' into gingerbread-plus-aosp

* commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70':
  Fix a deadlock I ran into.
 2010-09-23 14:17:54 -07:00
Andreas Huber
c2f6c6a149 Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly." into gingerbread 2010-09-23 14:16:48 -07:00
Dianne Hackborn
63dfdc39ca Merge "Fix a deadlock I ran into." into gingerbread 2010-09-23 14:15:45 -07:00
Eric Fischer
82f019dca7 am 9c708358: am 37cedce1: Merge "Add an aapt option to allow string variations for different devices." into gingerbread 
Merge commit '9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7'

* commit '9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7':
  Add an aapt option to allow string variations for different devices.
 2010-09-23 13:52:00 -07:00
Eric Fischer
2d9b3556bb am 37cedce1: Merge "Add an aapt option to allow string variations for different devices." into gingerbread 
Merge commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed' into gingerbread-plus-aosp

* commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed':
  Add an aapt option to allow string variations for different devices.
 2010-09-23 13:49:44 -07:00
Gil Dobjanschi
702c9966fc Merge "1. Added OverlayFrame constuctor 2. Invalidate transitions when trimming video 3. Remove image file when removing an OverlayFrame 4. Bug fixes in the VideoEditor implementation" 2010-09-23 13:48:33 -07:00
Eric Fischer
38bcd2b853 Merge "Remove translations of date formats not needed since cupcake." 2010-09-23 13:47:53 -07:00
Eric Fischer
a939afe212 Merge "Add an aapt option to allow string variations for different devices." into gingerbread 2010-09-23 13:47:06 -07:00
Mathias Agopian
aa22d20554 am 9c4d7d67: am 5c6c5c7a: fix [3028370] GL get error should return a valid error if no context is bound. 
Merge commit '9c4d7d677097981a349c718902e29050dad3d59f'

* commit '9c4d7d677097981a349c718902e29050dad3d59f':
  fix [3028370] GL get error should return a valid error if no context is bound.
 2010-09-23 13:28:47 -07:00
Mathias Agopian
6ee79cfa2f am 5c6c5c7a: fix [3028370] GL get error should return a valid error if no context is bound. 
Merge commit '5c6c5c7a43d44316395f5c35ab713372124b8b4c' into gingerbread-plus-aosp

* commit '5c6c5c7a43d44316395f5c35ab713372124b8b4c':
  fix [3028370] GL get error should return a valid error if no context is bound.
 2010-09-23 13:24:11 -07:00
Mathias Agopian
05c53113e0 fix [3028370] GL get error should return a valid error if no context is bound. 
glGetError() will now always return GL_INVALID_OPERATION if called from a thread
with no GL context bound.

Change-Id: I28ba458871db051bb4f5a26668a1fa123526869c
 2010-09-23 13:19:02 -07:00
Steve Howard
5975b48b38 am 1fd11292: am bb0d23b5: Have DownloadManager pass file URIs for legacy external downloads 
Merge commit '1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3'

* commit '1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3':
  Have DownloadManager pass file URIs for legacy external downloads
 2010-09-23 13:11:19 -07:00
Steve Howard
7dcc4b1efd am 8449490a: am 4f564cde: Tweaks to download manager API based on API review feedback 
Merge commit '8449490a94fb5ab02be2a67d4b57c017d8abd75a'

* commit '8449490a94fb5ab02be2a67d4b57c017d8abd75a':
  Tweaks to download manager API based on API review feedback
 2010-09-23 13:10:58 -07:00
Scott Main
2a6477d011 am a2427797: am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 
Merge commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2'

* commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2':
  docs: add more info about state list drawable and onclick attribute to Button
 2010-09-23 13:10:22 -07:00
Dirk Dougherty
f3c9039800 am 1c75552d: am 5ee00e22: am 27de3a24: (-s ours) Doc change: ADT 0.9.9 version notes, size/sum update. 
Merge commit '1c75552d5b22573da15726b1309283bee85c3c2f'

* commit '1c75552d5b22573da15726b1309283bee85c3c2f':
  Doc change: ADT 0.9.9 version notes, size/sum update.
 2010-09-23 13:10:11 -07:00
Mathias Agopian
a656c57eed Merge "add a way to toggle the h/w composer at runtime" 2010-09-23 13:09:00 -07:00
Steve Howard
4cf6be5203 am bb0d23b5: Have DownloadManager pass file URIs for legacy external downloads 
Merge commit 'bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8' into gingerbread-plus-aosp

* commit 'bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8':
  Have DownloadManager pass file URIs for legacy external downloads
 2010-09-23 13:02:21 -07:00
Steve Howard
695079be17 am 4f564cde: Tweaks to download manager API based on API review feedback 
Merge commit '4f564cdeb8478f1a20263fc036c74cc4a63145c3' into gingerbread-plus-aosp

* commit '4f564cdeb8478f1a20263fc036c74cc4a63145c3':
  Tweaks to download manager API based on API review feedback
 2010-09-23 12:50:07 -07:00
Eric Laurent
285a20832e resolved conflicts for merge of ac4a284a to master 
Change-Id: Ia644f67b5d7d7e7137eef2284e9533b5819c12d8
 2010-09-23 12:22:44 -07:00
Amith Yamasani
9c17c2fe52 am 847810f0: am 6e98c280: Merge "Fix for IndexOutOfBounds in setComposingRegion." into gingerbread 
Merge commit '847810f0cdccd10e6e233281d4eb984b7ce8d680'

* commit '847810f0cdccd10e6e233281d4eb984b7ce8d680':
  Fix for IndexOutOfBounds in setComposingRegion.
 2010-09-23 11:56:40 -07:00
Scott Main
f1eab210cc am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 
Merge commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95' into gingerbread-plus-aosp

* commit '2dc43f3d4c721acf331d699e24d9aac4d4cc2f95':
  docs: add more info about state list drawable and onclick attribute to Button
 2010-09-23 11:46:10 -07:00
Scott Main
53c155baf8 am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 
Merge commit '5b7328f257a76ff6b7b60872d6a106002ff1f679' into gingerbread

* commit '5b7328f257a76ff6b7b60872d6a106002ff1f679':
  docs: add more info about state list drawable and onclick attribute to Button
 2010-09-23 11:41:48 -07:00
Dirk Dougherty
4bca146318 am 5ee00e22: am 27de3a24: (-s ours) Doc change: ADT 0.9.9 version notes, size/sum update. 
Merge commit '5ee00e22b95ae4ea0d2cae5d781e39b8d962686a' into gingerbread-plus-aosp

* commit '5ee00e22b95ae4ea0d2cae5d781e39b8d962686a':
  Doc change: ADT 0.9.9 version notes, size/sum update.
 2010-09-23 11:41:11 -07:00
Dirk Dougherty
76a56bd84b am 27de3a24: (-s ours) Doc change: ADT 0.9.9 version notes, size/sum update. 
Merge commit '27de3a240fcf6e5cdd1b228fa11ffcb4fdc73866' into gingerbread

* commit '27de3a240fcf6e5cdd1b228fa11ffcb4fdc73866':
  Doc change: ADT 0.9.9 version notes, size/sum update.
 2010-09-23 11:37:33 -07:00
Eric Laurent
2f13d6e368 am 7864c72b: Merge "Fix issue 3022800." into gingerbread 
Merge commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8' into gingerbread-plus-aosp

* commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8':
  Fix issue 3022800.
 2010-09-23 11:34:40 -07:00
Amith Yamasani
2a8bdd3a87 am 6e98c280: Merge "Fix for IndexOutOfBounds in setComposingRegion." into gingerbread 
Merge commit '6e98c280f792932d60bf9374c8979d9eadce2d9c' into gingerbread-plus-aosp

* commit '6e98c280f792932d60bf9374c8979d9eadce2d9c':
  Fix for IndexOutOfBounds in setComposingRegion.
 2010-09-23 11:34:11 -07:00
Irfan Sheriff
a1ac622dcf Merge "Add Wifi Protected Setup support" 2010-09-23 11:33:49 -07:00
Scott Main
fcaaa5a74a Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo 2010-09-23 11:23:48 -07:00
Eric Laurent
a9167bde9d Merge "Fix issue 3022800." into gingerbread 2010-09-23 11:07:06 -07:00
Amith Yamasani
2d2f44ca3d Merge "Fix for IndexOutOfBounds in setComposingRegion." into gingerbread 2010-09-23 11:03:49 -07:00