26437 Commits

Author SHA1 Message Date
Jean-Michel Trivi
90787e053a am bd3f8b71: am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread
Merge commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f'

* commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f':
  Fix swap of sessionId and output in audio effect API.
2010-07-09 12:34:03 -07:00
Jean-Michel Trivi
bd3f8b7116 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
e7b790f1f7 Merge "Fix swap of sessionId and output in audio effect API." into gingerbread 2010-07-09 12:30:28 -07:00
Jean-Michel Trivi
4cb15cf15d Fix swap of sessionId and output in audio effect API.
Change-Id: Idc93415efef92087507401e50cfb235a6f1f7ed7
2010-07-09 12:11:49 -07:00
James Dong
020057bd53 am a60337ce: am 6bb14e08: Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread
Merge commit 'a60337ce578f91926a5e8ea30cb47740b994fc96'

* commit 'a60337ce578f91926a5e8ea30cb47740b994fc96':
  Enable the support for decoding audio with AAC+ and eAAC+ features
2010-07-09 11:43:59 -07:00
James Dong
a60337ce57 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
6bb14e08da Merge "Enable the support for decoding audio with AAC+ and eAAC+ features" into gingerbread 2010-07-09 11:38:45 -07:00
Romain Guy
20030a6303 Merge "Remove support for density compatibility in the hardware renderer." 2010-07-09 10:39:32 -07:00
Romain Guy
dbd77cd444 Remove support for density compatibility in the hardware renderer.
Change-Id: I535e919986e5ccfb344ede8516ccd84c02642823
2010-07-09 10:36:05 -07:00
Grace Kloba
0fb624259e Merge "Combine base PictureSet with composite layers into one SkLayer tree to get ready for GL rendering." 2010-07-09 10:05:34 -07:00
Daniel Sandler
dce7cf9831 am 339716e0: am f99e27da: Merge "Make android:immersive public." into gingerbread
Merge commit '339716e03c293c1ab29492e38936643f08d797fa'

* commit '339716e03c293c1ab29492e38936643f08d797fa':
  Make android:immersive public.
2010-07-09 09:20:27 -07:00
James Dong
5fe0ae8c20 am 4f440632: am 929642ee: Add runtime dumpsys support for media recorder client
Merge commit '4f4406322dafd6e128b437edbc541327f0b38d04'

* commit '4f4406322dafd6e128b437edbc541327f0b38d04':
  Add runtime dumpsys support for media recorder client
2010-07-09 09:20:03 -07:00
Mike Lockwood
d2097a9e50 Merge "Remove some scafolding and test code that is no longer worth maintaining." 2010-07-09 09:01:21 -07:00
Mike Lockwood
c5c7853b63 Remove some scafolding and test code that is no longer worth maintaining.
Change-Id: I9ee62d2463d8df1246a84774e8ac7e674778279a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-09 11:07:55 -04:00
Ben Murdoch
177eb38ef5 Update the file filter in DumpRenderTree (and DumpRenderTree2) so that
we run tests in .xhtml files.

Change-Id: I2af0bd29acef5bafa9dee9292aafc18d77a84080
2010-07-09 16:06:40 +01:00
Steve Block
2b2fa12cd0 Merge "Update Browser useragent string to reflect WebKit merge at r62496" 2010-07-09 07:35:38 -07:00
Daniel Sandler
339716e03c 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
f99e27da0b Merge "Make android:immersive public." into gingerbread 2010-07-09 06:07:51 -07:00
Maksymilian Osowski
029c62d866 Merge "A basic extension of ListActivity that allows navigating through tests and test folders." 2010-07-09 04:31:40 -07:00
Steve Block
59c76b87fd Update Browser useragent string to reflect WebKit merge at r62496
Change-Id: I502ae0d565ef9bd4bd3746685b2452da12ec61d6
2010-07-09 11:42:42 +01:00
Maksymilian Osowski
6fd7112e5c A basic extension of ListActivity that allows navigating through tests and test folders.
It provides the user with the simple UI that makes it easy to chose which tests to run.

Change-Id: Ifd0c4665de73e5702b892e57f5e91f84db36b248
2010-07-09 10:13:55 +01:00
James Dong
a7c14078af Enable the support for decoding audio with AAC+ and eAAC+ features
bug - 282684

Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b
2010-07-08 21:37:46 -07:00
James Dong
4f4406322d 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
James Dong
929642ee00 Add runtime dumpsys support for media recorder client
Change-Id: I4c8a81720f3be2db54678a7e84fe12849255046b
2010-07-08 21:25:55 -07:00
Romain Guy
831e550b49 Merge "Draw n-patches using OpenGL." 2010-07-08 19:21:13 -07:00
Romain Guy
f7f93556c8 Draw n-patches using OpenGL.
Currently only tested with title bars and buttons.

Change-Id: I8263a9281898dc0e943b1b8412827fe55639b9d6
2010-07-08 19:19:07 -07:00
Eric Laurent
0f399ec640 am b4b0f67a: am fd84f97a: Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
Merge commit 'b4b0f67a4743503a024b1dce758acf53d9fb86f7'

* commit 'b4b0f67a4743503a024b1dce758acf53d9fb86f7':
  Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
2010-07-08 19:10:46 -07:00
Brett Chabot
bbfe0b2264 am 243f7f85: am f6120cf4: Merge "Improve InstrumentationTestRunner exception handling." into gingerbread
Merge commit '243f7f85ea9e57716590b9cf355e55d1f0236fce'

* commit '243f7f85ea9e57716590b9cf355e55d1f0236fce':
  Improve InstrumentationTestRunner exception handling.
2010-07-08 19:10:29 -07:00
Dianne Hackborn
d8a6271bb1 am 49159f07: am 74bf59b4: Merge "Add new glue code for writing native apps." into gingerbread
Merge commit '49159f0748c704e53a7bd754f26113d9ab844a97'

* commit '49159f0748c704e53a7bd754f26113d9ab844a97':
  Add new glue code for writing native apps.
2010-07-08 19:10:17 -07:00
Jason Parks
2a57917a5c 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
ac85b829f6 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
ddfd24c329 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
eff55802b5 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
9df613a7df 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
511d9ec363 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
28e230352b 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
1a33274d28 resolved conflicts for merge of 167449e5 to master
Change-Id: Ib448e69a726eb45b5c9099d2574e40b8345eee67
2010-07-08 19:01:13 -07:00
Adam Powell
6f10db885f Merge "Fix some issues with smooth scrolling ListViews" 2010-07-08 18:39:42 -07:00
Dianne Hackborn
53c67c8dfd Fix build.
Change-Id: I60185df6150d13d704a28933bc919527da173307
2010-07-08 18:27:42 -07:00
Adam Powell
371133174b Fix some issues with smooth scrolling ListViews
Change-Id: I8b0f3d318eb0508ed12b92584c368e6f0edeb0be
2010-07-08 18:21:48 -07:00
Eric Laurent
b4b0f67a47 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
Eric Laurent
fd84f97af4 Added JAVA classes to control bass boost, equalizer, reverberation and virtualizer Effects.
Defined the following JAVA classes on top of AudioEffect class to facilitate control
off built-in audio effects with APIs aligned with interfaces defined in OpenSL ES
specification:
- BastBoot.java
- Equalizer.java
- PresetReverb.java
- EnvironmentalReverb.java
- Virtualizer.java

Split reverb API header file in two, one for preset reverb and one for environmental reverb.
Some changes in test reverb to support preset reverb.

Change-Id: Ie0a5ba06002e63dfd6da22cace5568c1e0b76ea1
2010-07-08 15:32:51 -07:00
Dianne Hackborn
c801768e4d Integrate Loader support in to Activity/Fragment.
Introduces a new LoaderManager class that takes care of
most of what LoaderManagingFragment does.  Every Fragment
and Activity can have one instance of this class.  In the
future, the instance will be retained across config changes.

Also various other cleanups and improvement.

Change-Id: I3dfb406dca46bda7f5acb3c722efcbfb8d0aa9ba
2010-07-08 15:17:22 -07:00
Grace Kloba
8abd50b748 Combine base PictureSet with composite layers into
one SkLayer tree to get ready for GL rendering.

Now UI holds its copy of SkLayer tree. The top node
is BaseLayerAndroid which has the PictureSet as its
content.

There is a matching change in external/webkit.
2010-07-08 15:02:14 -07:00
Mike Lockwood
2951c6d057 Merge "MTP: Use media provider database to implement MTP device support." 2010-07-08 14:29:59 -07:00
Brett Chabot
243f7f85ea 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
Vasu Nori
07e1b1dd16 Merge "reduce java locking on SQLiteDatabase if sql is already compiled" 2010-07-08 14:10:16 -07:00
Brett Chabot
f6120cf431 Merge "Improve InstrumentationTestRunner exception handling." into gingerbread 2010-07-08 14:09:21 -07:00
Mike Lockwood
d21eac9c70 MTP: Use media provider database to implement MTP device support.
Uses a new "MTP objects" table in the media provider to support basic
enumeration of the external storage file system.
Support for accessing audio, video and image metadata in the existing
media provider tables will be added in a later commit.

The C++ MtpDatabase class is now abstract, to support a proxy subclass that
calls through JNI to the Java MtpDatabase class in the media provider.

Change-Id: I90f0db5f3acc5d35ae78c27a8507edff16d14305
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-08 16:21:09 -04:00
Mike Lockwood
6d9e1e63a4 Merge "MTP: remove separate audio table from prototype MTP database" 2010-07-08 13:09:17 -07:00