Commit Graph

16630 Commits

Author SHA1 Message Date
Robert Ly
267569494f am b1008010: am ef13d028: docchange: fixed typo "Pacskage" to "Package"
Merge commit 'b10080106909fd860ed33ac46de9f2f084e358d6' into gingerbread-plus-aosp

* commit 'b10080106909fd860ed33ac46de9f2f084e358d6':
  docchange: fixed typo "Pacskage" to "Package"
2010-07-12 15:11:25 -07:00
Robert Ly
cee6103d08 am ef13d028: docchange: fixed typo "Pacskage" to "Package"
Merge commit 'ef13d028217ac9766735f627dedc4fc7f48a6f1f' into gingerbread

* commit 'ef13d028217ac9766735f627dedc4fc7f48a6f1f':
  docchange: fixed typo "Pacskage" to "Package"
2010-07-12 15:07:40 -07:00
David Brown
2787a7cfe6 am d1af902c: Merge "Deprecate some status bar icons that now come from the phone app (and shouldn\'t have been public in the first place.)" into gingerbread
Merge commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540' into gingerbread-plus-aosp

* commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540':
  Deprecate some status bar icons that now come from the phone app (and
2010-07-12 13:32:54 -07:00
David Brown
188d3b0a28 Merge "Deprecate some status bar icons that now come from the phone app (and shouldn't have been public in the first place.)" into gingerbread 2010-07-12 13:30:58 -07:00
Kenny Root
723499ae23 am 87bb1857: Merge changes I2337051b,I19b426cb into gingerbread
Merge commit '87bb18579a5eea2e24af78af8c0f54f5455ce8fd' into gingerbread-plus-aosp

* commit '87bb18579a5eea2e24af78af8c0f54f5455ce8fd':
  Tweak ObbFile class
  Allow things that can install packages to set Obb paths
2010-07-12 11:20:04 -07:00
Kenny Root
9baa2c7a44 Merge changes I2337051b,I19b426cb into gingerbread
* changes:
  Tweak ObbFile class
  Allow things that can install packages to set Obb paths
2010-07-12 11:18:34 -07:00
Kenny Root
fa59afb863 Tweak ObbFile class
* Move error messages around to clarify the errors.

* Add extra error check when reading a file.

* Seek to the end of a file when writing the signature so the users of
  the API don't have to remember to do it.

Change-Id: I2337051b9f9fa8147c5900237deec790dcd92436
2010-07-12 09:11:24 -07:00
Dianne Hackborn
7b48b5f6c8 am faccac76: Make a stupid thing about the glue less stupid.
Merge commit 'faccac7616795859af257777900db514d425a106' into gingerbread-plus-aosp

* commit 'faccac7616795859af257777900db514d425a106':
  Make a stupid thing about the glue less stupid.
2010-07-09 18:27:51 -07:00
Dianne Hackborn
c9ab2f8f90 am 289b9b62: Add ANativeWindow API for directly drawing to the surface bits.
Merge commit '289b9b62372ef52a06113b83dfb870e2c2fb325a' into gingerbread-plus-aosp

* commit '289b9b62372ef52a06113b83dfb870e2c2fb325a':
  Add ANativeWindow API for directly drawing to the surface bits.
2010-07-09 17:03:14 -07:00
Dianne Hackborn
9147d11a5f Add ANativeWindow API for directly drawing to the surface bits.
Also other cleanup and fixes:

- We now properly set the default window format to 565.
- New APIs to set the window format and flags from native code.
- Tweaked glue for simpler handling of the "destroy" message.
- Um, other stuff.

Change-Id: Id7790a21a2fa9a19b91854d225324a7c1e7c6ade
2010-07-09 16:58:19 -07:00
The Android Open Source Project
2196401413 merge from open-source master
Change-Id: Ia0dff818a574c8bc79aa79d65fd21bab9f9f6c30
2010-07-09 15:59:17 -07:00
The Android Open Source Project
3ab3e72b1c merge from open-source master
Change-Id: Id6ea4cd9546236ead0c181be82643256525f70b3
2010-07-09 15:56:45 -07:00
The Android Open Source Project
4e8d825370 ignore from open-source master
Change-Id: I8f474f33c225416242421db0ff6c08267d4ce002
2010-07-09 15:50:11 -07:00
Jean-Baptiste Queru
57c87d26a8 Merge "Improved logging when there's an error creating the directories in getFilesDir()" 2010-07-09 14:06:38 -07:00
David Brown
47d7b17f21 am 2aaa9e9f: Merge "Remove some (unused, non-public) phone-related status bar notification icons" into gingerbread
Merge commit '2aaa9e9fc5ddc05cedbe530c7a41eca0e3a62b7a' into gingerbread-plus-aosp

* commit '2aaa9e9fc5ddc05cedbe530c7a41eca0e3a62b7a':
  Remove some (unused, non-public) phone-related status bar notification icons
2010-07-09 13:00:00 -07:00
David Brown
4865402092 Merge "Remove some (unused, non-public) phone-related status bar notification icons" into gingerbread 2010-07-09 12:57:39 -07:00
Jean-Michel Trivi
29a2fa2eb0 am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread
Merge commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5' into gingerbread-plus-aosp

* commit 'e7b790f1f77a0950c163fc82d8833072ccf6f3c5':
  Fix swap of sessionId and output in audio effect API.
2010-07-09 12:32:21 -07:00
Jean-Michel Trivi
5b8e7a6da2 Merge "Fix swap of sessionId and output in audio effect API." into gingerbread 2010-07-09 12:30:28 -07:00
James Dong
ff1573dcc7 am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread
Merge commit '6bb14e08da82e72197f35548ff77a2f817c52a58' into gingerbread-plus-aosp

* commit '6bb14e08da82e72197f35548ff77a2f817c52a58':
  Enable the support for decoding audio with AAC+ and eAAC+ features
2010-07-09 11:41:08 -07:00
James Dong
e133ad9828 Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread 2010-07-09 11:38:45 -07:00
Daniel Sandler
b9a74ef132 am f99e27da: Merge "Make android:immersive public." into gingerbread
Merge commit 'f99e27da0b2e8d9f6be205b20191581c7951dfbc' into gingerbread-plus-aosp

* commit 'f99e27da0b2e8d9f6be205b20191581c7951dfbc':
  Make android:immersive public.
2010-07-09 06:10:26 -07:00
Daniel Sandler
5ac1d3acf8 Merge "Make android:immersive public." into gingerbread 2010-07-09 06:07:51 -07:00
James Dong
0f8bda9860 am 929642ee: Add runtime dumpsys support for media recorder client
Merge commit '929642ee003895b6e4e85ad7e43c7c6f01b29020' into gingerbread-plus-aosp

* commit '929642ee003895b6e4e85ad7e43c7c6f01b29020':
  Add runtime dumpsys support for media recorder client
2010-07-08 21:37:43 -07:00
Jean-Baptiste Queru
e02daf9c05 Merge "update 404'd source.android.com URLs" 2010-07-08 16:25:03 -07:00
Eric Laurent
d6f55cbd78 am fd84f97a: Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
Merge commit 'fd84f97af4b44d54bba53bb85b31a6dbce07f6e2' into gingerbread-plus-aosp

* commit 'fd84f97af4b44d54bba53bb85b31a6dbce07f6e2':
  Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
2010-07-08 16:14:31 -07:00
Brett Chabot
35362d4734 am f6120cf4: Merge "Improve InstrumentationTestRunner exception handling." into gingerbread
Merge commit 'f6120cf431804e072f34699a5d8a3fae62492cee' into gingerbread-plus-aosp

* commit 'f6120cf431804e072f34699a5d8a3fae62492cee':
  Improve InstrumentationTestRunner exception handling.
2010-07-08 14:12:10 -07:00
Brett Chabot
0ec4ce7696 Merge "Improve InstrumentationTestRunner exception handling." into gingerbread 2010-07-08 14:09:21 -07:00
Dianne Hackborn
cf9bd8d743 am 74bf59b4: Merge "Add new glue code for writing native apps." into gingerbread
Merge commit '74bf59b450daf9e7e6bf234f01db164099edbfd5' into gingerbread-plus-aosp

* commit '74bf59b450daf9e7e6bf234f01db164099edbfd5':
  Add new glue code for writing native apps.
2010-07-08 12:26:32 -07:00
Dianne Hackborn
5234c75f9b Merge "Add new glue code for writing native apps." into gingerbread 2010-07-08 12:25:20 -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
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
Dianne Hackborn
3c5d125ed7 Add new glue code for writing native apps.
This factors out the boiler-plate code from the sample
app to a common glue code that can be used for everyone
writing this style of app: a dedicated app thread that
takes care of waiting for events and processing them.

As part of doing this, ALooper has a new facility to allow
registration of fds that cause ALooper_pollOnce() to return
the fd that has data, allowing the app to drive the loop
without callbacks.  Hopefully this makes some people feel better. :)

Also do some other cleanup of the ALooper API, plus some
actual documentation.

Change-Id: Ic53bd56bdf627e3ba28a3c093faa06a92be522b8
2010-07-08 11:06:59 -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
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
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
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
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