ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,661 Commits 2 Branches 0 Tags 54 MiB
e3372bd6f0
Commit Graph

20661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
e3372bd6f0 am 099aa9a1: am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread 
Merge commit '099aa9a1b4eaf6536decbcafac43476c4908ef24'

* commit '099aa9a1b4eaf6536decbcafac43476c4908ef24':
  add a fps counter to sanangeles demo
 2010-09-08 19:04:07 -07:00
Mathias Agopian
7d1588e4e3 am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread 
Merge commit 'edbb8083a815e9d911f8e659fc5c293543fdf502' into gingerbread-plus-aosp

* commit 'edbb8083a815e9d911f8e659fc5c293543fdf502':
  add a fps counter to sanangeles demo
 2010-09-08 19:01:37 -07:00
Mathias Agopian
b1ef9664ad Merge "add a fps counter to sanangeles demo" into gingerbread 2010-09-08 18:57:42 -07:00
Mathias Agopian
879ba138fc add a fps counter to sanangeles demo 
Change-Id: I9a9473ce213301cc7661fddfb1ef5a6ffcb346d4
 2010-09-08 18:55:42 -07:00
Dirk Dougherty
b34cd44833 am eed5d17d: am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK 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.
 2010-09-08 18:22:33 -07:00
Dirk Dougherty
b91d1dc00a am ea68cab8: am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and 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.
 2010-09-08 18:14:04 -07:00
Romain Guy
0ddf0656c4 Merge "Purge Skia objects from GL caches as needed." 2010-09-08 18:06:11 -07:00
Dirk Dougherty
225bcbbb3c am 3eb07ea4: Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 
Merge commit '3eb07ea483225974484c018d7d5affbf4815ceb2' into gingerbread

* commit '3eb07ea483225974484c018d7d5affbf4815ceb2':
  Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
 2010-09-08 18:05:58 -07:00
Romain Guy
4e0c1f27fd Purge Skia objects from GL caches as needed. 
Change-Id: I754c671cf790ad5ae8bf047ad328034217da4ecc
 2010-09-08 18:04:33 -07:00
James Dong
02ab7a0cc4 am 306cd58d: am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread 
Merge commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334'

* commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334':
  HW audio encoder expects timestamp via kKeyTime from each input buffer
 2010-09-08 17:57:56 -07:00
James Dong
f162d063c1 am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from 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
 2010-09-08 17:54:28 -07:00
Dirk Dougherty
f84969b2cf Merge "Doc change: Add notes for SDK Tools r7 and ADT 0.9.8." into froyo 2010-09-08 17:52:45 -07:00
James Dong
bc18f2f224 Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread 2010-09-08 17:51:59 -07:00
Mike LeBeau
eccea3c111 am 573c5d5e: am 46b84d5b: Merge "Add 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
 2010-09-08 17:49:34 -07:00
Mike LeBeau
7d8f43d615 am 46b84d5b: Merge "Add 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 '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb' into gingerbread-plus-aosp

* commit '46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb':
  Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
 2010-09-08 17:46:22 -07:00
Chet Haase
a74b0065df Merge "Fix bug with LayoutTransition when layouts are just coming on line" 2010-09-08 17:44:39 -07:00
Adam Cohen
9f285cb78a Merge "AdapterViewAnimator now properly handles notifyDataSetChanged" 2010-09-08 17:43:17 -07:00
Mike LeBeau
cfe9e734e8 Merge "Add 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 2010-09-08 17:43:15 -07:00
Eric Laurent
5fc16eab67 am e126119c: am 95d86480: Merge "Modify type of some environmental reverb parameters" into gingerbread 
Merge commit 'e126119c3a406bc564f2549aeb1416aff112689d'

* commit 'e126119c3a406bc564f2549aeb1416aff112689d':
  Modify type of some environmental reverb parameters
 2010-09-08 17:22:54 -07:00
Eric Laurent
6fdd49d4ca am 95d86480: Merge "Modify type of some environmental reverb parameters" into gingerbread 
Merge commit '95d8648054223a501fe5390edef7e5d9383a4be8' into gingerbread-plus-aosp

* commit '95d8648054223a501fe5390edef7e5d9383a4be8':
  Modify type of some environmental reverb parameters
 2010-09-08 17:19:43 -07:00
Eric Laurent
e44e03854c Merge "Modify type of some environmental reverb parameters" into gingerbread 2010-09-08 17:17:38 -07:00
Mathias Agopian
ed902274ba am 3fa7d8af: am 9bfb060a: Merge "Force wallpaper surface to 565." into gingerbread 
Merge commit '3fa7d8af6560de07ef673f73308f7e51de64e4ec'

* commit '3fa7d8af6560de07ef673f73308f7e51de64e4ec':
  Force wallpaper surface to 565.
 2010-09-08 16:50:13 -07:00
Mathias Agopian
9e003f3528 am 9bfb060a: Merge "Force wallpaper surface to 565." into gingerbread 
Merge commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8' into gingerbread-plus-aosp

* commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8':
  Force wallpaper surface to 565.
 2010-09-08 16:46:46 -07:00
Mathias Agopian
403d0beb13 Merge "Force wallpaper surface to 565." into gingerbread 2010-09-08 16:43:42 -07:00
Adam Powell
f5ad609eee Merge "Added resources and styles for ActionBar tabs" 2010-09-08 16:14:47 -07:00
John Wang
a119c40479 am d8f62ec4: am a48dc39b: Add hangupForegroundResumeBackground(). 
Merge commit 'd8f62ec44706153490bf63cddeac7d9c76e9e742'

* commit 'd8f62ec44706153490bf63cddeac7d9c76e9e742':
  Add hangupForegroundResumeBackground().
 2010-09-08 16:00:11 -07:00
John Wang
e841c93910 am a48dc39b: Add hangupForegroundResumeBackground(). 
Merge commit 'a48dc39bd55c5ddcd991e08f791fd18d94a0db12' into gingerbread-plus-aosp

* commit 'a48dc39bd55c5ddcd991e08f791fd18d94a0db12':
  Add hangupForegroundResumeBackground().
 2010-09-08 15:56:41 -07:00
Brad Fitzpatrick
f74bb9e123 am f2bf6d6e: am 65634a79: Merge "Don\'t block in the BackupManagerService.dataChanged() Binder call." into gingerbread 
Merge commit 'f2bf6d6e705b655a546a9e6435e6acef3a82cda3'

* commit 'f2bf6d6e705b655a546a9e6435e6acef3a82cda3':
  Don't block in the BackupManagerService.dataChanged() Binder call.
 2010-09-08 15:51:41 -07:00
Gilles Debunne
d55ea09900 am de5cfcb6: am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread 
Merge commit 'de5cfcb608f3432d98ae17e0febb6e726df79e90'

* commit 'de5cfcb608f3432d98ae17e0febb6e726df79e90':
  Fix for a memory leak in TextKeyListener.
 2010-09-08 15:50:50 -07:00
Robert Greenwalt
fc92bdc7f7 Merge "Some cleanup of Proxy class." 2010-09-08 15:35:40 -07:00
Brad Fitzpatrick
6e32003ce0 am 65634a79: Merge "Don\'t block in the BackupManagerService.dataChanged() Binder call." into gingerbread 
Merge commit '65634a7935ed6f173179e7ac91a05288693b2bbf' into gingerbread-plus-aosp

* commit '65634a7935ed6f173179e7ac91a05288693b2bbf':
  Don't block in the BackupManagerService.dataChanged() Binder call.
 2010-09-08 15:26:57 -07:00
Brad Fitzpatrick
0b89753186 Merge "Don't block in the BackupManagerService.dataChanged() Binder call." into gingerbread 2010-09-08 15:20:20 -07:00
Romain Guy
ad1bc796ee Merge "Fix possible infinite loop when purging textures." 2010-09-08 15:16:13 -07:00
Gilles Debunne
23cd8a0366 am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread 
Merge commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050' into gingerbread-plus-aosp

* commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050':
  Fix for a memory leak in TextKeyListener.
 2010-09-08 15:02:20 -07:00
Gilles Debunne
79694bc16e Merge "Fix for a memory leak in TextKeyListener." into gingerbread 2010-09-08 14:58:23 -07:00
Dianne Hackborn
c1c14d5f3a am 5fdacb8a: am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread 
Merge commit '5fdacb8a2818136218afdea4308ad1b10049a201'

* commit '5fdacb8a2818136218afdea4308ad1b10049a201':
  People holding partial wake locks now get blamed for CPU usage.
 2010-09-08 14:38:20 -07:00
Jake Hamby
22599ab342 am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread 
Merge commit 'e75783440a55fb0a5ef75066be94a11898f652f0'

* commit 'e75783440a55fb0a5ef75066be94a11898f652f0':
  Allow incoming SMS until internal storage is almost full.
 2010-09-08 14:38:15 -07:00
Jeff Brown
e1e37e4c7b am 8723bb58: am b21fb104: Fix key repeat delay. 
Merge commit '8723bb58b17a07b7ca036cc76d737c6c0f4b13c7'

* commit '8723bb58b17a07b7ca036cc76d737c6c0f4b13c7':
  Fix key repeat delay.
 2010-09-08 14:38:09 -07:00
Dianne Hackborn
55946fa9b5 am ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread 
Merge commit 'ee455f5a9572bc0d23c3328f6c22da91dc109a50' into gingerbread-plus-aosp

* commit 'ee455f5a9572bc0d23c3328f6c22da91dc109a50':
  People holding partial wake locks now get blamed for CPU usage.
 2010-09-08 14:34:41 -07:00
Jake Hamby
eded617eb4 am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread 
Merge commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78' into gingerbread-plus-aosp

* commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78':
  Allow incoming SMS until internal storage is almost full.
 2010-09-08 14:34:31 -07:00
Jeff Brown
a4caf30745 am b21fb104: Fix key repeat delay. 
Merge commit 'b21fb104cc95fe7e5daf3b3626241e525c39a3f1' into gingerbread-plus-aosp

* commit 'b21fb104cc95fe7e5daf3b3626241e525c39a3f1':
  Fix key repeat delay.
 2010-09-08 14:34:26 -07:00
Joe Onorato
ebccbe3094 Merge "move recent apps around, attempting to make it not crash." 2010-09-08 14:30:05 -07:00
Dianne Hackborn
955566417b Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread 2010-09-08 14:15:35 -07:00
Jeff Brown
98baa3cd18 am 6bb72458: (-s ours) am de2f3340: Update current.xml for touch filtering feature. 
Merge commit '6bb72458f934f00fdfee75323a7919a9f10eba03'

* commit '6bb72458f934f00fdfee75323a7919a9f10eba03':
  Update current.xml for touch filtering feature.
 2010-09-08 14:03:10 -07:00
Jeff Brown
6240634883 resolved conflicts for merge of a05088c1 to master 
Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521
 2010-09-08 13:02:55 -07:00
Jake Hamby
6cee99c76b Merge "Allow incoming SMS until internal storage is almost full." into gingerbread 2010-09-08 12:49:27 -07:00
Jeff Brown
8a8a4f52ee am de2f3340: Update current.xml for touch filtering feature. 
Merge commit 'de2f3340d64e20e51029ff438f0d635d97b8a3e0' into gingerbread-plus-aosp

* commit 'de2f3340d64e20e51029ff438f0d635d97b8a3e0':
  Update current.xml for touch filtering feature.
 2010-09-08 12:29:49 -07:00
Jeff Brown
61ce3982e1 Fix key repeat delay. 
Change-Id: I6216e082324ee29bf50e37acc673350ca5417c4d
 2010-09-08 12:28:43 -07:00
Joe Onorato
869c125c91 Merge "Fix build due to stubs errors on filename changes" 2010-09-08 12:11:55 -07:00
Jeff Brown
9c9021c2d4 am 85a31767: Add support for secure views. 
Merge commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6' into gingerbread-plus-aosp

* commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6':
  Add support for secure views.
 2010-09-08 11:55:24 -07:00