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

17933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Parks
6baa899e28 am 49ff1e6c: am b29e3b9c: Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread 
Merge commit '49ff1e6c6c857e1a596fa0b75faaaf17cae08621'

* commit '49ff1e6c6c857e1a596fa0b75faaaf17cae08621':
  Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
 2010-07-08 19:10:10 -07:00
Scott Main
f892143e2d am 9fd45970: am 833830e0: am 286cf139: docs: add redirect for download.html 
Merge commit '9fd45970de75895c4b922b8ad5b8cab78f865c97'

* commit '9fd45970de75895c4b922b8ad5b8cab78f865c97':
  docs: add redirect for download.html
 2010-07-08 19:10:01 -07:00
Daniel Sandler
d3d2ae8090 am 4dc96b85: am f7d2b4a2: Use fullScreenIntent to show the USB mass storage dialog. 
Merge commit '4dc96b8513ad3d3af54321716251f789769a11b4'

* commit '4dc96b8513ad3d3af54321716251f789769a11b4':
  Use fullScreenIntent to show the USB mass storage dialog.
 2010-07-08 19:09:42 -07:00
Xia Wang
db67cad3b3 am f3bfd841: am 98738272: Merge "Remove voice mail number verification for testing on no-sim device" into gingerbread 
Merge commit 'f3bfd841019b404f98a67fc307240031790344c9'

* commit 'f3bfd841019b404f98a67fc307240031790344c9':
  Remove voice mail number verification for testing on no-sim device
 2010-07-08 19:09:28 -07:00
Scott Main
1d26a279c4 am 717b517a: am 1082ae03: am 5183ae3b: Merge "docs: add caution about adt in eclipse 3.6" into froyo 
Merge commit '717b517ab319b336a406d6df0926b30a1ea84bf8'

* commit '717b517ab319b336a406d6df0926b30a1ea84bf8':
  docs: add caution about adt in eclipse 3.6
 2010-07-08 19:09:23 -07:00
Kenny Root
2b5c82589c am 0a21801f: am a5402dab: Merge "OBB API for PackageManager" into gingerbread 
Merge commit '0a21801f5fae22cd5e1b3e9f1c1405c744e24c9b'

* commit '0a21801f5fae22cd5e1b3e9f1c1405c744e24c9b':
  OBB API for PackageManager
 2010-07-08 19:09:06 -07:00
Kenny Root
8d3ee58899 am d481cdd4: am c9535de8: Merge "Add OBB file helper class" into gingerbread 
Merge commit 'd481cdd4c0305f8afd857fe3ec3fbf189b744370'

* commit 'd481cdd4c0305f8afd857fe3ec3fbf189b744370':
  Add OBB file helper class
 2010-07-08 19:08:57 -07:00
Jeff Brown
9aac262cb3 resolved conflicts for merge of 167449e5 to master 
Change-Id: Ib448e69a726eb45b5c9099d2574e40b8345eee67
 2010-07-08 19:01:13 -07:00
Adam Powell
1ff3405415 Merge "Fix some issues with smooth scrolling ListViews" 2010-07-08 18:39:42 -07:00
Mike Lockwood
3f5ba9feb7 Merge "MTP: Use media provider database to implement MTP device support." 2010-07-08 14:29:59 -07:00
Vasu Nori
213f7eaa89 Merge "reduce java locking on SQLiteDatabase if sql is already compiled" 2010-07-08 14:10:16 -07:00
Mike Lockwood
fced0db9c4 Merge "MTP: remove separate audio table from prototype MTP database" 2010-07-08 13:09:17 -07:00
Romain Guy
68e95188ed Merge "Do not draw the fade areas when it's not necessary." 2010-07-08 12:54:25 -07:00
Jason Parks
ceef3d19a4 am b29e3b9c: Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread 
Merge commit 'b29e3b9cd00ced686a74121d3ca9c7380754793f' into gingerbread-plus-aosp

* commit 'b29e3b9cd00ced686a74121d3ca9c7380754793f':
  Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.
 2010-07-08 11:52:01 -07:00
Jason Parks
a0495e420c Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread 2010-07-08 11:50:40 -07:00
Romain Guy
ca214ffc56 Merge "Create FBOs in LayerCache." 2010-07-08 11:48:34 -07:00
Vasu Nori
e084eea915 Merge "STOPSHIP CL in master - make sqlite WAL default for all apps" 2010-07-08 11:43:24 -07:00
Scott Main
7b76d565d4 am 833830e0: am 286cf139: docs: add redirect for download.html 
Merge commit '833830e0640cd25dcf3ed29ea5a9bd835caded13' into gingerbread-plus-aosp

* commit '833830e0640cd25dcf3ed29ea5a9bd835caded13':
  docs: add redirect for download.html
 2010-07-08 11:42:53 -07:00
Scott Main
ba6c627d06 am 286cf139: docs: add redirect for download.html 
Merge commit '286cf139c3c33c99c1ec5e434ee1de5e10238e62' into gingerbread

* commit '286cf139c3c33c99c1ec5e434ee1de5e10238e62':
  docs: add redirect for download.html
 2010-07-08 11:40:11 -07:00
Daniel Sandler
22a78602cb am f7d2b4a2: Use fullScreenIntent to show the USB mass storage dialog. 
Merge commit 'f7d2b4a2e096ae1f8ac3a2ed8b2f0e30a237f732' into gingerbread-plus-aosp

* commit 'f7d2b4a2e096ae1f8ac3a2ed8b2f0e30a237f732':
  Use fullScreenIntent to show the USB mass storage dialog.
 2010-07-08 10:29:26 -07:00
Dan Tasse
f8e79d7f44 am 7017e0d5: am f3f25bf8: Added some javadoc to Camera.takePicture() 
Merge commit '7017e0d5c372db1e470d9881c46b15eade051d76'

* commit '7017e0d5c372db1e470d9881c46b15eade051d76':
  Added some javadoc to Camera.takePicture()
 2010-07-07 20:55:47 -07:00
Eric Laurent
7385d4c799 am b91881fd: am dacabf97: Merge "Added Visualizer effect." into gingerbread 
Merge commit 'b91881fdd1608cc922f105ec552b5505da1fecb9'

* commit 'b91881fdd1608cc922f105ec552b5505da1fecb9':
  Added Visualizer effect.
 2010-07-07 20:55:40 -07:00
Xia Wang
9136e02938 am 98738272: Merge "Remove voice mail number verification for testing on no-sim device" into gingerbread 
Merge commit '98738272e3b680559e1e0a7b665a0ebb4038f684' into gingerbread-plus-aosp

* commit '98738272e3b680559e1e0a7b665a0ebb4038f684':
  Remove voice mail number verification for testing on no-sim device
 2010-07-07 19:05:48 -07:00
Xia Wang
e53d857c20 Merge "Remove voice mail number verification for testing on no-sim device" into gingerbread 2010-07-07 19:04:03 -07:00
Jason Sams
3eddc1df3d Merge "Fix image processing resource problem for non high-density devices. Protect include file." 2010-07-07 18:52:21 -07:00
Jason Sams
5e71ef9156 Merge "Add boolean support for setVar." 2010-07-07 18:52:03 -07:00
Fabrice Di Meglio
4ae0f2145b Merge "Fix bug #2779582 (Columns cleanup for the Calendars table)" 2010-07-07 18:46:10 -07:00
Scott Main
6af02e970d am 1082ae03: am 5183ae3b: Merge "docs: add caution about adt in eclipse 3.6" into froyo 
Merge commit '1082ae033dbe7d278b3fef6e4fd9af149d360fc1' into gingerbread-plus-aosp

* commit '1082ae033dbe7d278b3fef6e4fd9af149d360fc1':
  docs: add caution about adt in eclipse 3.6
 2010-07-07 18:45:14 -07:00
Scott Main
eb41bbb57b am 5183ae3b: Merge "docs: add caution about adt in eclipse 3.6" into froyo 
Merge commit '5183ae3b0f27dfff5ecdceabaa4950eef38b31e8' into gingerbread

* commit '5183ae3b0f27dfff5ecdceabaa4950eef38b31e8':
  docs: add caution about adt in eclipse 3.6
 2010-07-07 18:43:10 -07:00
Scott Main
4c655a2689 Merge "docs: add caution about adt in eclipse 3.6" into froyo 2010-07-07 18:37:48 -07:00
Kenny Root
a2d4c6eea0 am a5402dab: Merge "OBB API for PackageManager" into gingerbread 
Merge commit 'a5402dabec84eabcdb9008dc343dd67de325bbac' into gingerbread-plus-aosp

* commit 'a5402dabec84eabcdb9008dc343dd67de325bbac':
  OBB API for PackageManager
 2010-07-07 18:16:05 -07:00
Kenny Root
48a047b3c8 am c9535de8: Merge "Add OBB file helper class" into gingerbread 
Merge commit 'c9535de8e398d766c95144f9a831f34b2cecfd91' into gingerbread-plus-aosp

* commit 'c9535de8e398d766c95144f9a831f34b2cecfd91':
  Add OBB file helper class
 2010-07-07 18:16:01 -07:00
Kenny Root
d2f8cadc6a Merge "OBB API for PackageManager" into gingerbread 2010-07-07 18:14:25 -07:00
Kenny Root
47ecb07ed4 Merge "Add OBB file helper class" into gingerbread 2010-07-07 18:14:13 -07:00
Romain Guy
39bdf25342 Merge "Add support to draw 9patches in OpenGL." 2010-07-07 17:57:12 -07:00
Chris Tate
651056ff43 am b17f4dcf: Merge "More native input dispatch work." into gingerbread 
Merge commit 'b17f4dcfb3edba25bd8c30e60449b9bbcd600a57' into gingerbread-plus-aosp

* commit 'b17f4dcfb3edba25bd8c30e60449b9bbcd600a57':
  More native input dispatch work.
 2010-07-07 17:45:21 -07:00
Chris Tate
9e1568cc2d Merge "More native input dispatch work." into gingerbread 2010-07-07 17:43:12 -07:00
Dan Tasse
d4f88f4def am f3f25bf8: Added some javadoc to Camera.takePicture() 
Merge commit 'f3f25bf80b7d21f12442da8f82d17c79dd371692' into gingerbread-plus-aosp

* commit 'f3f25bf80b7d21f12442da8f82d17c79dd371692':
  Added some javadoc to Camera.takePicture()
 2010-07-07 17:21:46 -07:00
Eric Laurent
37369af6a3 am dacabf97: Merge "Added Visualizer effect." into gingerbread 
Merge commit 'dacabf97c609a040ada857a7da6c560097448ae3' into gingerbread-plus-aosp

* commit 'dacabf97c609a040ada857a7da6c560097448ae3':
  Added Visualizer effect.
 2010-07-07 16:34:57 -07:00
Eric Laurent
b687191959 Merge "Added Visualizer effect." into gingerbread 2010-07-07 16:23:30 -07:00
Vasu Nori
952872f684 Merge "for WAL to work, can't keep prepared SQL stmt_id in SQLiteStatement" 2010-07-07 15:35:26 -07:00
Romain Guy
d8d357c485 Merge "Simpler way to deal with the FBO multi-cache." 2010-07-07 15:18:33 -07:00
Dirk Dougherty
8ad726395d am 3338775d: am 4b9baa69: am 2651504c: (-s ours) Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo 
Merge commit '3338775df7a19e0785c9badcedd90b99cda22013'

* commit '3338775df7a19e0785c9badcedd90b99cda22013':
  Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
 2010-07-07 15:11:02 -07:00
Dirk Dougherty
d06d818ef6 am 4b9baa69: am 2651504c: (-s ours) Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo 
Merge commit '4b9baa69f3b3146edbc623f0670103265c4f4fe5' into gingerbread-plus-aosp

* commit '4b9baa69f3b3146edbc623f0670103265c4f4fe5':
  Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
 2010-07-07 15:08:59 -07:00
Dirk Dougherty
d7750ebcb5 am 2651504c: (-s ours) Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo 
Merge commit '2651504c020f07847bafa3d539c36f1396629669' into gingerbread

* commit '2651504c020f07847bafa3d539c36f1396629669':
  Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
 2010-07-07 15:06:35 -07:00
James Dong
32ec5e7d15 am b3598832: am c4243342: Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread 
Merge commit 'b35988329ac1a574898db9226039e37e352c57a8'

* commit 'b35988329ac1a574898db9226039e37e352c57a8':
  Allow application to set two more encoding paramters: video profile and level
 2010-07-07 15:00:28 -07:00
James Dong
6481c7fd2b am 7b3f3048: am 58c35573: Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread 
Merge commit '7b3f3048725dcb217599590fcb55a5b26b93dc4e'

* commit '7b3f3048725dcb217599590fcb55a5b26b93dc4e':
  Fix some bugs in the MediaProfileReader
 2010-07-07 15:00:22 -07:00
Kenny Root
c737a0c929 Merge "Support bidi layout for drawTextOnPath." 2010-07-07 14:59:09 -07:00
James Dong
a3a757588c am c4243342: Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread 
Merge commit 'c42433427a7ed51b5577b2587bf6cb0af903ebf8' into gingerbread-plus-aosp

* commit 'c42433427a7ed51b5577b2587bf6cb0af903ebf8':
  Allow application to set two more encoding paramters: video profile and level
 2010-07-07 14:58:30 -07:00
James Dong
06c6175475 am 58c35573: Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread 
Merge commit '58c35573cc677b736efefa267eba8727d4411999' into gingerbread-plus-aosp

* commit '58c35573cc677b736efefa267eba8727d4411999':
  Fix some bugs in the MediaProfileReader
 2010-07-07 14:58:26 -07:00