Commit Graph

17530 Commits

Author SHA1 Message Date
James Dong
ae80ffa8ae am 39e876ad: (-s ours) Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
Merge commit '39e876ad743f203fe005333947c61383772b0d14' into gingerbread

* commit '39e876ad743f203fe005333947c61383772b0d14':
  When filling the cache, we always time out waiting for a condition that won't occur.
2010-06-17 18:43:10 -07:00
Jason Sams
9992c0b77c Merge "Remove legacy drawing functions. Skip element names starting with '#'" 2010-06-17 18:06:42 -07:00
Dianne Hackborn
5b3e5cf106 am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Merge commit '57f4503e1a129d6a648f2378d36a060998a577a0' into froyo-plus-aosp

* commit '57f4503e1a129d6a648f2378d36a060998a577a0':
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
2010-06-17 16:58:15 -07:00
Jason Sams
303d0f0d79 Merge "Add skip to field packer. remove hsb functions from env headers. add RS_PACKED define for packed structures." 2010-06-17 15:56:08 -07:00
Vasu Nori
023bcfd2b0 Merge "move a sqlite test from framework-tests to coretests" 2010-06-17 14:38:34 -07:00
Jaikumar Ganesh
bc06a0958d Merge "HID profile." 2010-06-17 13:58:49 -07:00
Jeff Brown
a2a988401d am 29f28cfe: am e899caf8: Fixed api/current.xml after a bad merge.
Merge commit '29f28cfe2188179519094e35d7fad09588170e88'

* commit '29f28cfe2188179519094e35d7fad09588170e88':
  Fixed api/current.xml after a bad merge.
2010-06-17 13:57:05 -07:00
Jeff Brown
d00b8980f6 am e899caf8: Fixed api/current.xml after a bad merge.
Merge commit 'e899caf8cce1d1a20121f19a99899553ae2b327e' into gingerbread-plus-aosp

* commit 'e899caf8cce1d1a20121f19a99899553ae2b327e':
  Fixed api/current.xml after a bad merge.
2010-06-17 13:53:48 -07:00
Romain Guy
81f01bae35 Merge "Add libhwui, to hardware accelerate the Canvas API using OpenGL ES 2.0." 2010-06-17 13:42:37 -07:00
Jeff Brown
e780fc9d96 am 42bb545a: am 5c225b16: Even more native input dispatch work in progress.
Merge commit '42bb545a54d89f0ddbb230d7a01ea4210c0f6c00'

* commit '42bb545a54d89f0ddbb230d7a01ea4210c0f6c00':
  Even more native input dispatch work in progress.
2010-06-17 13:32:45 -07:00
Jeff Brown
b0f3174923 am 5c225b16: Even more native input dispatch work in progress.
Merge commit '5c225b1680e696ae8bbf505a1997d6f720672f74' into gingerbread-plus-aosp

* commit '5c225b1680e696ae8bbf505a1997d6f720672f74':
  Even more native input dispatch work in progress.
2010-06-17 13:31:07 -07:00
Daniel Sandler
1d055eb0b9 am 747f75dc: am 3a0146cd: Merge "New API for "immersive" activity windows." into gingerbread
Merge commit '747f75dc0882138828ac2b2752c2872ccae49747'

* commit '747f75dc0882138828ac2b2752c2872ccae49747':
  New API for "immersive" activity windows.
2010-06-17 13:27:47 -07:00
Daniel Sandler
86a68a6d34 am 04b4f781: am cc86c933: Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread
Merge commit '04b4f781b118fa9c815910bf5d2a772cdfef07c2'

* commit '04b4f781b118fa9c815910bf5d2a772cdfef07c2':
  New API for high-priority Notifications and full-screen alerts.
2010-06-17 13:27:34 -07:00
Jeff Brown
f4a4ec2063 Even more native input dispatch work in progress.
Added more tests.
Fixed a regression in Vector.
Fixed bugs in pointer tracking.
Fixed a starvation issue in PollLoop when setting or removing callbacks.
Fixed a couple of policy nits.

Modified the internal representation of MotionEvent to be more
efficient and more consistent.

Added code to skip/cancel virtual key processing when there are multiple
pointers down.  This helps to better disambiguate virtual key presses
from stray touches (such as cheek presses).

Change-Id: I2a7d2cce0195afb9125b23378baa94fd2fc6671c
2010-06-17 13:27:16 -07:00
Daniel Sandler
f42630c1d1 am 3a0146cd: Merge "New API for "immersive" activity windows." into gingerbread
Merge commit '3a0146cd29fae3c5bc29d8d535d67826284f8cc9' into gingerbread-plus-aosp

* commit '3a0146cd29fae3c5bc29d8d535d67826284f8cc9':
  New API for "immersive" activity windows.
2010-06-17 13:26:03 -07:00
Daniel Sandler
3e760ed7dd am cc86c933: Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread
Merge commit 'cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf' into gingerbread-plus-aosp

* commit 'cc86c933f69e4c1d55e0f4f49936d04fb60d6bcf':
  New API for high-priority Notifications and full-screen alerts.
2010-06-17 13:25:56 -07:00
Daniel Sandler
e85dafb4d6 Merge "New API for "immersive" activity windows." into gingerbread 2010-06-17 13:24:01 -07:00
Daniel Sandler
ca3cb3d702 Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread 2010-06-17 13:23:59 -07:00
Dave Sparks
6a4b1abbfd am c05c83e2: am f3c6c982: am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly hig
Merge commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2'

* commit 'c05c83e272f8806d46a4e2470d000f2112e6efb2':
  TimedEventQueue is apparently important for glitch-free media playback, and so
2010-06-17 12:46:07 -07:00
Scott Main
3da5b04e2f am b8ce7bca: am 78e6622f: am 821ca518: docs: edits to resources doc
Merge commit 'b8ce7bca82882e81041a3e5bddbcaa073fb37234'

* commit 'b8ce7bca82882e81041a3e5bddbcaa073fb37234':
  docs: edits to resources doc
2010-06-17 12:46:03 -07:00
Scott Main
0ccab340ee am c65d4c10: am d22bffdf: am bccedb03: docs: update dashboard again
Merge commit 'c65d4c107f7c9bab731b198281109e576c2f6956'

* commit 'c65d4c107f7c9bab731b198281109e576c2f6956':
  docs: update dashboard again
2010-06-17 12:45:58 -07:00
Dan Morrill
a22366c536 am dde1ae84: am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7'

* commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:45:53 -07:00
Dave Sparks
3a9d7ca651 am f3c6c982: am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than norm
Merge commit 'f3c6c982f68e6ada3cded6923301d2f6236f3c17' into gingerbread-plus-aosp

* commit 'f3c6c982f68e6ada3cded6923301d2f6236f3c17':
  TimedEventQueue is apparently important for glitch-free media playback, and so
2010-06-17 12:42:24 -07:00
Scott Main
d8d1ff2af1 am 78e6622f: am 821ca518: docs: edits to resources doc
Merge commit '78e6622fbb2bacdac68269b60cc694275ae132a4' into gingerbread-plus-aosp

* commit '78e6622fbb2bacdac68269b60cc694275ae132a4':
  docs: edits to resources doc
2010-06-17 12:42:21 -07:00
Scott Main
8fbf364271 am d22bffdf: am bccedb03: docs: update dashboard again
Merge commit 'd22bffdf6f2f899913c4dcf7fa75241f7c270059' into gingerbread-plus-aosp

* commit 'd22bffdf6f2f899913c4dcf7fa75241f7c270059':
  docs: update dashboard again
2010-06-17 12:42:18 -07:00
Dan Morrill
7c59b61084 am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8' into gingerbread-plus-aosp

* commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:42:14 -07:00
Dave Sparks
a02e07d879 am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro
Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into gingerbread

* commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
  TimedEventQueue is apparently important for glitch-free media playback, and so
2010-06-17 12:37:15 -07:00
Scott Main
be6c121108 am 821ca518: docs: edits to resources doc
Merge commit '821ca51857f4d21b231cd9ead786227b771fe759' into gingerbread

* commit '821ca51857f4d21b231cd9ead786227b771fe759':
  docs: edits to resources doc
2010-06-17 12:37:06 -07:00
Scott Main
e79243be84 am bccedb03: docs: update dashboard again
Merge commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222' into gingerbread

* commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222':
  docs: update dashboard again
2010-06-17 12:36:31 -07:00
Dan Morrill
2beceb7f98 am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into gingerbread

* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:36:17 -07:00
Scott Main
d64fcd75c2 am 5f11e95f: docs: small edits to catchup to edits made in html pushed live
Merge commit '5f11e95f0041e163e8aa9e429aec92c8ee942233' into froyo-plus-aosp

* commit '5f11e95f0041e163e8aa9e429aec92c8ee942233':
  docs: small edits to catchup to edits made in html pushed live
2010-06-17 12:23:58 -07:00
James Dong
73d1a539e7 am 39e876ad: Merge "When filling the cache, we always time out waiting for a condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
Merge commit '39e876ad743f203fe005333947c61383772b0d14' into froyo-plus-aosp

* commit '39e876ad743f203fe005333947c61383772b0d14':
  When filling the cache, we always time out waiting for a condition that won't occur.
2010-06-17 12:23:48 -07:00
Dave Sparks
25b5fc3cdf am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro
Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into froyo-plus-aosp

* commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b':
  TimedEventQueue is apparently important for glitch-free media playback, and so
2010-06-17 12:23:44 -07:00
Scott Main
fa56cb4e72 am 821ca518: docs: edits to resources doc
Merge commit '821ca51857f4d21b231cd9ead786227b771fe759' into froyo-plus-aosp

* commit '821ca51857f4d21b231cd9ead786227b771fe759':
  docs: edits to resources doc
2010-06-17 12:23:35 -07:00
Scott Main
3eee82d740 am bccedb03: docs: update dashboard again
Merge commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222' into froyo-plus-aosp

* commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222':
  docs: update dashboard again
2010-06-17 12:23:18 -07:00
Dan Morrill
02c719bc78 am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into froyo-plus-aosp

* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:23:03 -07:00
James Dong
095e865efc am 48a7c1d2: am 42a18c09: Check and clip some video encoding parameters against media profiles before passing them to video encoder
Merge commit '48a7c1d25f6afe020eb95ce60da95ad70f71f84c'

* commit '48a7c1d25f6afe020eb95ce60da95ad70f71f84c':
  Check and clip some video encoding parameters against media profiles before passing them to video encoder
2010-06-17 11:50:46 -07:00
James Dong
6408e743e7 am 42a18c09: Check and clip some video encoding parameters against media profiles before passing them to video encoder
Merge commit '42a18c09e7bb9c372382e88053409c25563ae7c9' into gingerbread-plus-aosp

* commit '42a18c09e7bb9c372382e88053409c25563ae7c9':
  Check and clip some video encoding parameters against media profiles before passing them to video encoder
2010-06-17 11:49:17 -07:00
Adam Powell
a325510748 Merge "Merging ActionBar menu with options menu." 2010-06-17 11:38:36 -07:00
James Dong
9479e69028 am d8402d78: am cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
Merge commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783'

* commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783':
  Remove hard-coded number of audio channels in AudioSource
2010-06-17 11:28:28 -07:00
James Dong
cab9de64e4 am cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
Merge commit 'cd677a30851e4ba8b79a41c20e20220a81719378' into gingerbread-plus-aosp

* commit 'cd677a30851e4ba8b79a41c20e20220a81719378':
  Remove hard-coded number of audio channels in AudioSource
2010-06-17 11:26:57 -07:00
James Dong
5c362805cc Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread 2010-06-17 11:25:19 -07:00
Gilles Debunne
be79de628a Merge "Removed warnings in LayoutInflater." 2010-06-17 10:05:29 -07:00
Gilles Debunne
44e3366854 Merge "Index out of range problem in TextLine." 2010-06-17 10:05:11 -07:00
Dianne Hackborn
dd9316f9e2 am 9a1034aa: am 6b7b4845: Various improvements to battery stats collection
Merge commit '9a1034aa9746b94ecb659ea849765a160bdf747e'

* commit '9a1034aa9746b94ecb659ea849765a160bdf747e':
  Various improvements to battery stats collection
2010-06-16 19:55:12 -07:00
Dianne Hackborn
1cf651a192 am 6b7b4845: Various improvements to battery stats collection
Merge commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb' into gingerbread-plus-aosp

* commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb':
  Various improvements to battery stats collection
2010-06-16 18:49:28 -07:00
Fabrice Di Meglio
7f3d253a9a Merge "Fix bug #2772731 (Start deprecation of "url" Calendars column in favor of "eventsUrl" column)" 2010-06-16 17:01:48 -07:00
Gilles Debunne
dc58a3bc25 Merge "Suppressed warnings in TextView." 2010-06-16 16:29:53 -07:00
Dmitri Plotnikov
eb92178c5b Merge "Preventing cursor leaks when a query is interrupted" 2010-06-16 16:15:08 -07:00
James Dong
748ad2b542 Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo 2010-06-16 16:10:52 -07:00