Commit Graph

17995 Commits

Author SHA1 Message Date
Jason Sams
e0f1cff1fa gl perf test cleanup.
Change-Id: Ic486774e25421bd2f412f0ba2bbac4660e3982b8
2010-07-12 11:59:34 -07:00
Patrick Dubroy
806f633780 Merge "Convert the minWidth and minHeight to device units when calling getInstalledProviders" 2010-07-12 11:40:58 -07:00
Kenny Root
d441a0ca24 am ceb8465e: am 87bb1857: Merge changes I2337051b,I19b426cb into gingerbread
Merge commit 'ceb8465e974ba5fa971ffe1b5b74e94a1bd53f97'

* commit 'ceb8465e974ba5fa971ffe1b5b74e94a1bd53f97':
  Tweak ObbFile class
  Allow things that can install packages to set Obb paths
2010-07-12 11:22:45 -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
Tadashi G. Takaoka
08e74c7ede Merge "Fix that setInputMethod throw exception with wrong method id" 2010-07-12 10:41:08 -07:00
Maksymilian Osowski
6b1d08b28c Merge "Added dialogs to the DirListActivity." 2010-07-12 10:40:15 -07:00
Steve Block
9b9c788142 Merge "Update DumpRenderTree to look in platform/android for Android-specific results" 2010-07-12 10:01:50 -07:00
Mike Lockwood
95f21811ed Merge "MediaProvider: Add constants for media_table and media_id columns in MTP objects table" 2010-07-12 09:54:32 -07:00
Andy McFadden
2355c9df02 Merge "Fix build." 2010-07-12 09:19:05 -07:00
Andy McFadden
a5c381fd51 Fix build.
Added missing #include <string.h>.

Change-Id: Idf151876851110098fe538a042f896784821919b
2010-07-12 09:17:13 -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
e5c1f0321b am bbf0bde5: am faccac76: Make a stupid thing about the glue less stupid.
Merge commit 'bbf0bde5d8311f84b6f0a8d018d78a78429602b7'

* commit 'bbf0bde5d8311f84b6f0a8d018d78a78429602b7':
  Make a stupid thing about the glue less stupid.
2010-07-09 18:30:22 -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
47c320febd am b14f325a: am 289b9b62: Add ANativeWindow API for directly drawing to the surface bits.
Merge commit 'b14f325a0118ffce286155caaabaae149653462c'

* commit 'b14f325a0118ffce286155caaabaae149653462c':
  Add ANativeWindow API for directly drawing to the surface bits.
2010-07-09 17:05:23 -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
Gilles Debunne
c6226ac949 Merge "New cursor controller in TextViews." 2010-07-09 16:22:30 -07:00
Romain Guy
88604725a5 Merge "Fix alpha blending and improve fragment shaders performance." 2010-07-09 16:15:35 -07:00
The Android Open Source Project
89f5c210bb am 0260887c: merge from open-source master
Merge commit '0260887ca78330b8dd7009d91859925df94a69d6'

* commit '0260887ca78330b8dd7009d91859925df94a69d6':
  Improved logging when there's an error creating the directories in getFilesDir()
2010-07-09 16:01:00 -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
9c340e62d8 am 990d9ca4: merge from open-source master
Merge commit '990d9ca416d1410130333b7b461162c953a1f0c2'

* commit '990d9ca416d1410130333b7b461162c953a1f0c2':
  update 404'd source.android.com URLs
2010-07-09 15:58:45 -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
e6e78eaa41 am 3dbbf2dc: ignore from open-source master
Merge commit '3dbbf2dc21dae3ac3a157fa7b83eee12201d6270'

* commit '3dbbf2dc21dae3ac3a157fa7b83eee12201d6270':
  Fix send/receive MMS while the phone's state isn't in IDLE and the Network type can support voice and data calls concurrently
2010-07-09 15:53:17 -07:00
The Android Open Source Project
4e8d825370 ignore from open-source master
Change-Id: I8f474f33c225416242421db0ff6c08267d4ce002
2010-07-09 15:50:11 -07:00
Jason Sams
612242bee7 Merge "Remove points from fixed function. Add basic GL performance test." 2010-07-09 15:35:09 -07:00
Jason Sams
e448dd1a4f Remove points from fixed function.
Add basic GL performance test.

Change-Id: I421a41b6683b2c5f70045cdd0f610a6939105fee
2010-07-09 15:34:32 -07:00
David Brown
1f64805bc7 am d321e8d6: am 2aaa9e9f: Merge "Remove some (unused, non-public) phone-related status bar notification icons" into gingerbread
Merge commit 'd321e8d6882485203b159b224d49247707bdd5aa'

* commit 'd321e8d6882485203b159b224d49247707bdd5aa':
  Remove some (unused, non-public) phone-related status bar notification icons
2010-07-09 14:13:00 -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
Romain Guy
2a86f3ab3c Merge "Refactoring to move vertex computing to the Patch class." 2010-07-09 13:55:35 -07:00
Vasu Nori
0d4727e162 Merge "reduce locking when using SQLiteStatement" 2010-07-09 13:37:45 -07:00
Romain Guy
69719c912d Merge "Avoid unnecessary tests when drawing ListView dividers." 2010-07-09 13:29:00 -07:00
Romain Guy
d14ca6584d Merge "Optimize blending state changes." 2010-07-09 13:28:06 -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
d63e7cb721 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
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
a1ca7c50cd 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
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
Romain Guy
b1f5a929ad Merge "Remove support for density compatibility in the hardware renderer." 2010-07-09 10:39:32 -07:00
Grace Kloba
7f8c51ef66 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
4b3ded522b 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
19e2f7c8f5 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
11ace36d8f Merge "Remove some scafolding and test code that is no longer worth maintaining." 2010-07-09 09:01:21 -07:00
Steve Block
4205fcd815 Merge "Update Browser useragent string to reflect WebKit merge at r62496" 2010-07-09 07:35:38 -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
Maksymilian Osowski
598874e75f Merge "A basic extension of ListActivity that allows navigating through tests and test folders." 2010-07-09 04:31:40 -07:00