Commit Graph

20944 Commits

Author SHA1 Message Date
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
Jason Sams
74b28e45c3 Rework gl perf test to focus on important use cases.
Change-Id: I82825dbe3b24a520b79f6b05d01f37e1b5008b62
2010-09-08 15:48:53 -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
Jeff Brown
af30ff6020 Add support for secure views.
Added the MotionEvent.FLAG_WINDOW_IS_OBSCURED flag which is set by the
input manager whenever another visible window is partly or wholly obscured
the target of a touch event so that applications can filter touches
accordingly.

Added a "filterTouchesWhenObscured" attribute to View which can be used to
enable filtering of touches when the view's window is obscured.

Change-Id: I936d9c85013fd2d77fb296a600528d30a29027d2
2010-09-08 11:50:55 -07:00
Jack Veenstra
8acbdc8ca9 Merge "Add support for giving arrays of ints and longs to the "am" command." 2010-09-08 11:44:05 -07:00
Jean-Baptiste Queru
8fe633bf57 am 6ffee9bb: Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp
Merge commit '6ffee9bbba53700d33456261b986ac8a3f333b9e'

* commit '6ffee9bbba53700d33456261b986ac8a3f333b9e':
  Revert "resolve conflicts"
2010-09-08 11:07:30 -07:00
Erik
7c98e7640f am c4f628a1: am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Merge commit 'c4f628a1ba359926cf53ed7652d9abba6ea29123'

* commit 'c4f628a1ba359926cf53ed7652d9abba6ea29123':
  Adds a time zone parameter to formatDateRange
2010-09-08 11:04:41 -07:00
Jean-Baptiste Queru
0940dfb829 Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp 2010-09-08 11:03:22 -07:00
Erik
07b072ad2f am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Merge commit 'c0b4f6d30d962d75125628317b5f5ea622531dfe' into gingerbread-plus-aosp

* commit 'c0b4f6d30d962d75125628317b5f5ea622531dfe':
  Adds a time zone parameter to formatDateRange
2010-09-08 11:01:27 -07:00
Erik
d71a3160ae Merge "Adds a time zone parameter to formatDateRange" into gingerbread 2010-09-08 10:58:12 -07:00
Mike Lockwood
a2a66def70 Merge changes Ib18b93bf,I4c86d7e3
* changes:
  MTP: Allow transfering arbitrary file types.
  Rename the media database's "objects" table to "files"
2010-09-08 10:52:44 -07:00
Gilles Debunne
31af5348b0 am d4fd86d1: (-s ours) am 468394fc: Text Selection: smart word detection. DO NOT MERGE.
Merge commit 'd4fd86d19a070a355255b51742075fbf8e69fa4a'

* commit 'd4fd86d19a070a355255b51742075fbf8e69fa4a':
  Text Selection: smart word detection. DO NOT MERGE.
2010-09-08 10:38:45 -07:00
Elliott Hughes
fb3d25d917 am 664c48e9: am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread
Merge commit '664c48e991a70d07646d54125e97f579f3a33be4'

* commit '664c48e991a70d07646d54125e97f579f3a33be4':
  Remove dead code: NIOBuffer.
2010-09-08 10:38:41 -07:00
Chung-yih Wang
370ff2cd7f am 4f24aed2: am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread
Merge commit '4f24aed2a13d9ba89e2402894353176e19571e6e'

* commit '4f24aed2a13d9ba89e2402894353176e19571e6e':
  Fix the dialing from contact for internet address.
2010-09-08 10:38:35 -07:00
Chung-yih Wang
ca88a80015 am 576b492c: am 5de1d36d: Log outbound proxy address if exists for debugging.
Merge commit '576b492c15a079c9d3d818f3f7fadc4408c2908a'

* commit '576b492c15a079c9d3d818f3f7fadc4408c2908a':
  Log outbound proxy address if exists for debugging.
2010-09-08 10:35:11 -07:00
Gilles Debunne
486d70d27a am 468394fc: Text Selection: smart word detection. DO NOT MERGE.
Merge commit '468394fc6d1cb0c9078c2f98aa056860f7e0d743' into gingerbread-plus-aosp

* commit '468394fc6d1cb0c9078c2f98aa056860f7e0d743':
  Text Selection: smart word detection. DO NOT MERGE.
2010-09-08 10:32:42 -07:00
Elliott Hughes
3077e21d2b am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread
Merge commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f' into gingerbread-plus-aosp

* commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f':
  Remove dead code: NIOBuffer.
2010-09-08 10:32:38 -07:00
Chung-yih Wang
fd857d1589 am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread
Merge commit '669070787cc10377c2e5c3fa187babc728d96245' into gingerbread-plus-aosp

* commit '669070787cc10377c2e5c3fa187babc728d96245':
  Fix the dialing from contact for internet address.
2010-09-08 10:32:13 -07:00
Jean-Baptiste Queru
f3c06fd804 am 84f992a2: resolve conflicts
Merge commit '84f992a249491b9f755e879bf096baac3f9472f5'

* commit '84f992a249491b9f755e879bf096baac3f9472f5':
  Adding Download Manager Integration, stress, and hosts-based tests.
2010-09-08 10:28:41 -07:00
Chung-yih Wang
205b84897c am 5de1d36d: Log outbound proxy address if exists for debugging.
Merge commit '5de1d36dd0415c4cf9afdf093a4915951ef6c770' into gingerbread-plus-aosp

* commit '5de1d36dd0415c4cf9afdf093a4915951ef6c770':
  Log outbound proxy address if exists for debugging.
2010-09-08 10:28:09 -07:00
Chet Haase
398143d919 Merge "Rename several animation classes" 2010-09-08 10:25:19 -07:00