summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add support for advanced blend modes with the framebuffer.Romain Guy2010-09-097-38/+236
| | | | | | | This adds the ability to blend with the framebuffer using Darken, Lighten, Add, Multiply, Overlay and Screen. Change-Id: Iae01a53797d4ad39c373cba6ff2a42293129da1a
* Do not convert 8888 bitmaps to 565 when doing a copy.Romain Guy2010-09-092-13/+38
| | | | | | | | Bug #2988077 This change keeps the 8888 format for new bitmaps and also keeps, when possible, the opaque flag. Change-Id: Ia61f2e89936916b329212a4c59a7d815c329f84e
* A Path can exist in several cache entries.Romain Guy2010-09-091-1/+0
| | | | Change-Id: I742f7425d2b6bef753ed3e04fb39ebb103b2dc00
* am 099aa9a1: am edbb8083: Merge "add a fps counter to sanangeles demo" into ↵Mathias Agopian2010-09-081-9/+18
|\ | | | | | | | | | | | | | | | | gingerbread Merge commit '099aa9a1b4eaf6536decbcafac43476c4908ef24' * commit '099aa9a1b4eaf6536decbcafac43476c4908ef24': add a fps counter to sanangeles demo
| * am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbreadMathias Agopian2010-09-081-9/+18
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'edbb8083a815e9d911f8e659fc5c293543fdf502' into gingerbread-plus-aosp * commit 'edbb8083a815e9d911f8e659fc5c293543fdf502': add a fps counter to sanangeles demo
| | * Merge "add a fps counter to sanangeles demo" into gingerbreadMathias Agopian2010-09-081-9/+18
| | |\
| | | * add a fps counter to sanangeles demoMathias Agopian2010-09-081-9/+18
| | | | | | | | | | | | | | | | Change-Id: I9a9473ce213301cc7661fddfb1ef5a6ffcb346d4
* | | | am eed5d17d: am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK ↵Dirk Dougherty2010-09-0811-44/+186
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tools r7 and ADT 0.9.8." into froyo Merge commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50' * commit 'eed5d17d7869e77495b9836118a4ffbd5c3ebf50': Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
| * | | am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ↵Dirk Dougherty2010-09-0811-44/+186
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ADT 0.9.8." into froyo Merge commit 'ea68cab8a33d3169de33c7112000cd3dae233afe' into gingerbread-plus-aosp * commit 'ea68cab8a33d3169de33c7112000cd3dae233afe': Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
| | * | am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." ↵Dirk Dougherty2010-09-0811-44/+186
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread * commit '3eb07ea483225974484c018d7d5affbf4815ceb2': Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
| | | * \ Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyoDirk Dougherty2010-09-0811-44/+186
| | | |\ \
| | | | * | Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.Dirk Dougherty2010-09-0811-44/+186
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7cc8301e0160acd0adb3efbd20c6515ed985684f
* | | | | | Merge "Purge Skia objects from GL caches as needed."Romain Guy2010-09-0812-4/+98
|\ \ \ \ \ \
| * | | | | | Purge Skia objects from GL caches as needed.Romain Guy2010-09-0812-4/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I754c671cf790ad5ae8bf047ad328034217da4ecc
* | | | | | | am 306cd58d: am d353c840: Merge "HW audio encoder expects timestamp via ↵James Dong2010-09-085-4/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kKeyTime from each input buffer" into gingerbread Merge commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334' * commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334': HW audio encoder expects timestamp via kKeyTime from each input buffer
| * | | | | | am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from ↵James Dong2010-09-085-4/+7
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | each input buffer" into gingerbread Merge commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7' into gingerbread-plus-aosp * commit 'd353c840ad5bf1b4e6bfba0e10bcdc79223bcdf7': HW audio encoder expects timestamp via kKeyTime from each input buffer
| | * | | | | Merge "HW audio encoder expects timestamp via kKeyTime from each input ↵James Dong2010-09-085-4/+7
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | buffer" into gingerbread
| | | * | | | | HW audio encoder expects timestamp via kKeyTime from each input bufferJames Dong2010-09-085-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This fixes media server crashes on droid Change-Id: I7191cadc5275107425ec3ee3d437b2c5295858dc
* | | | | | | | am 573c5d5e: am 46b84d5b: Merge "Add ↵Mike LeBeau2010-09-082-0/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread Merge commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9' * commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9': Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
| * | | | | | | am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for ↵Mike LeBeau2010-09-082-0/+27
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread Merge commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb' into gingerbread-plus-aosp * commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb': Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
| | * | | | | | Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended ↵Mike LeBeau2010-09-082-0/+27
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | search and play of music. This is used, for instance, by Google's new "listen to" Voice Action." into gingerbread
| | | * | | | | | Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-endedMike LeBeau2010-09-082-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | search and play of music. This is used, for instance, by Google's new "listen to" Voice Action. Change-Id: Ibbc81701cc2412ffd57402d34f22d9764e9df7c2
* | | | | | | | | Merge "Fix bug with LayoutTransition when layouts are just coming on line"Chet Haase2010-09-081-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix bug with LayoutTransition when layouts are just coming on lineChet Haase2010-09-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia7061d8ec138f8f7aea822596f46b3549a996700
* | | | | | | | | | Merge "AdapterViewAnimator now properly handles notifyDataSetChanged"Adam Cohen2010-09-081-10/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | AdapterViewAnimator now properly handles notifyDataSetChangedAdam Cohen2010-09-081-10/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icc22671b76d49c4229f118f77a5c269253a07b84
* | | | | | | | | | | am e126119c: am 95d86480: Merge "Modify type of some environmental reverb ↵Eric Laurent2010-09-082-24/+26
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameters" into gingerbread Merge commit 'e126119c3a406bc564f2549aeb1416aff112689d' * commit 'e126119c3a406bc564f2549aeb1416aff112689d': Modify type of some environmental reverb parameters
| * | | | | | | | | | am 95d86480: Merge "Modify type of some environmental reverb parameters" ↵Eric Laurent2010-09-082-24/+26
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '95d8648054223a501fe5390edef7e5d9383a4be8' into gingerbread-plus-aosp * commit '95d8648054223a501fe5390edef7e5d9383a4be8': Modify type of some environmental reverb parameters
| | * | | | | | | | | Merge "Modify type of some environmental reverb parameters" into gingerbreadEric Laurent2010-09-082-24/+26
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | | * | | | | | | | Modify type of some environmental reverb parametersEric Laurent2010-09-082-24/+26
| | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed type of decay time, reverb delay and reflections delay parameters from signed to unsigned int to match OpenSL ES interface definition. Also fixed some type casts in lvm reverb wrapper. Change-Id: I5ca5e76a87c2590f01f031f3168355586ef22556
* | | | | | | | | | am 3fa7d8af: am 9bfb060a: Merge "Force wallpaper surface to 565." into ↵Mathias Agopian2010-09-082-1/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '3fa7d8af6560de07ef673f73308f7e51de64e4ec' * commit '3fa7d8af6560de07ef673f73308f7e51de64e4ec': Force wallpaper surface to 565.
| * | | | | | | | | am 9bfb060a: Merge "Force wallpaper surface to 565." into gingerbreadMathias Agopian2010-09-082-1/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8' into gingerbread-plus-aosp * commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8': Force wallpaper surface to 565.
| | * | | | | | | | Merge "Force wallpaper surface to 565." into gingerbreadMathias Agopian2010-09-082-1/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Force wallpaper surface to 565.Mathias Agopian2010-09-082-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to maintain backward compatibility with badly programmed GL wallpapers. Wallpapers can call SurfaceHolder.setFormat() to request a different format. Change-Id: Ib42b0cf6c7040d1300cad239c3acfd5c4c6cd326
* | | | | | | | | | | Merge "Added resources and styles for ActionBar tabs"Adam Powell2010-09-0812-6/+91
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added resources and styles for ActionBar tabsAdam Powell2010-09-0812-6/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ba5502146dec2d71b3e9ff57d90e7b5bd2bc2a0
* | | | | | | | | | | | am d8f62ec4: am a48dc39b: Add hangupForegroundResumeBackground().John Wang2010-09-081-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd8f62ec44706153490bf63cddeac7d9c76e9e742' * commit 'd8f62ec44706153490bf63cddeac7d9c76e9e742': Add hangupForegroundResumeBackground().
| * | | | | | | | | | | am a48dc39b: Add hangupForegroundResumeBackground().John Wang2010-09-081-0/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a48dc39bd55c5ddcd991e08f791fd18d94a0db12' into gingerbread-plus-aosp * commit 'a48dc39bd55c5ddcd991e08f791fd18d94a0db12': Add hangupForegroundResumeBackground().
| | * | | | | | | | | | Add hangupForegroundResumeBackground().John Wang2010-09-081-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To fix bug 2968310. Handle the operation of hangupForegroundResumeBackground while foreground call and background call come from different phones. Change-Id: Id83ca1b75031a8391c95c7f8b2be40e9067dd4cd
* | | | | | | | | | | | am f2bf6d6e: am 65634a79: Merge "Don\'t block in the ↵Brad Fitzpatrick2010-09-081-44/+72
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BackupManagerService.dataChanged() Binder call." into gingerbread Merge commit 'f2bf6d6e705b655a546a9e6435e6acef3a82cda3' * commit 'f2bf6d6e705b655a546a9e6435e6acef3a82cda3': Don't block in the BackupManagerService.dataChanged() Binder call.
| * | | | | | | | | | | am 65634a79: Merge "Don\'t block in the BackupManagerService.dataChanged() ↵Brad Fitzpatrick2010-09-081-44/+72
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binder call." into gingerbread Merge commit '65634a7935ed6f173179e7ac91a05288693b2bbf' into gingerbread-plus-aosp * commit '65634a7935ed6f173179e7ac91a05288693b2bbf': Don't block in the BackupManagerService.dataChanged() Binder call.
| | * | | | | | | | | | Merge "Don't block in the BackupManagerService.dataChanged() Binder call." ↵Brad Fitzpatrick2010-09-081-44/+72
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | into gingerbread
| | | * | | | | | | | | Don't block in the BackupManagerService.dataChanged() Binder call.Brad Fitzpatrick2010-09-071-44/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This unnecessarily blocks callers. Bug: 2977348 Change-Id: I5267e575cdd5eb2136379f9710126b62a1bd75ad
* | | | | | | | | | | | am de5cfcb6: am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." ↵Gilles Debunne2010-09-081-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'de5cfcb608f3432d98ae17e0febb6e726df79e90' * commit 'de5cfcb608f3432d98ae17e0febb6e726df79e90': Fix for a memory leak in TextKeyListener.
| * | | | | | | | | | | am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbreadGilles Debunne2010-09-081-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050' into gingerbread-plus-aosp * commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050': Fix for a memory leak in TextKeyListener.
| | * | | | | | | | | | Merge "Fix for a memory leak in TextKeyListener." into gingerbreadGilles Debunne2010-09-081-2/+4
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix for a memory leak in TextKeyListener.Gilles Debunne2010-09-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Open source contribution https://review.source.android.com/#change,16985 Change-Id: Iebf09e147dd26575ca1a3f02180a678583671a68
* | | | | | | | | | | | | Merge "Some cleanup of Proxy class."Robert Greenwalt2010-09-083-30/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Some cleanup of Proxy class.Robert Greenwalt2010-09-033-30/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to using InetSocketAddress. Change-Id: Ibdb97fcd2d06eecaa1e847b78267180156089f27
* | | | | | | | | | | | | | Merge "Fix possible infinite loop when purging textures."Romain Guy2010-09-086-10/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |