25523 Commits

Author SHA1 Message Date
Chia-chi Yeh
2ce999fce7 am bd240c27: media: add AudioTrack::getMinFrameCount().
Merge commit 'bd240c2737913d6ed1982788699f93bbc52330c0' into gingerbread

* commit 'bd240c2737913d6ed1982788699f93bbc52330c0':
  media: add AudioTrack::getMinFrameCount().
2010-06-21 08:54:19 -07:00
Brad Fitzpatrick
04b243d0f5 Fix NPE during ANRs.
BUG=2780838

Change-Id: I0d5e9a2323130ca14d1f0df684c8abe4f4dad05a
2010-06-21 08:01:13 -07:00
Ben Murdoch
c530f36003 Web runtime
- link following with simple SOP check
 - back button
 - fullscreen (title shown as toast for now)

Change-Id: I6c64dd87b2f216f02a1d0ee4e7e5d51067ca80ee
2010-06-21 12:18:17 +01:00
Kenny Root
c4e38577f4 Import revised translations
Change-Id: Ife82312cc21acc144a70718f79afcafbdd7eda7a
2010-06-20 18:54:45 -07:00
Chia-chi Yeh
bd240c2737 media: add AudioTrack::getMinFrameCount().
Change-Id: If15162583d1d16d89f59be0793106afe77417f35
2010-06-21 09:51:18 +08:00
Evan Millar
25f3ab4ee7 Manual merge of change 53051 from master (DO NOT MERGE)
Change-Id: Ia4697a15cb874f25849655994e10aa88ae60b328
2010-06-18 16:19:26 -07:00
Jason Sams
94d0759987 Fountain example cleanup.
Remove compatability versions of rsg functions that took old 'i' types.

Change-Id: Icea268a37df5e212237299e094ba26c6f76468d7
2010-06-18 15:52:30 -07:00
Chia-chi Yeh
535c17a747 Revert "Don't chdir into the keystore directory"
The same functionality can be achieved by running "stop keystore".
This reverts commit 831c6cc7c1cfcf1271c75dc960948ab6ce720b67.
2010-06-19 04:44:22 +08:00
Adam Powell
7ade1be822 Action bar button layout changes.
Theme attribute added for spacing between action buttons. Action
buttons are now allowed to fill up to half of the total action bar's
width.

Change-Id: Iabbc67e695684529dfae9681d4d9580cd30839d0
2010-06-18 10:12:20 -07:00
Colin Cross
831c6cc7c1 Don't chdir into the keystore directory
If the keystore daemon chdir's into /data/misc/keystore, /data can
never be unmounted.  During bringup, it's helpful if we can umount
/data and reformat it.

Change-Id: Id5b93ee8a54846fd07e6e0e57bfd0a6fabf603ee
2010-06-17 22:50:10 -07:00
Daniel Sandler
53f2bb549e am fddf19f6: am a2650db7: Merge "Fix SDK docs build." into gingerbread
Merge commit 'fddf19f671dc91b9c50fa82870e1b3df29ce397a'

* commit 'fddf19f671dc91b9c50fa82870e1b3df29ce397a':
  Fix SDK docs build.
2010-06-17 19:18:31 -07:00
Daniel Sandler
fddf19f671 am a2650db7: Merge "Fix SDK docs build." into gingerbread
Merge commit 'a2650db770e93a9424d6d6948fd31f943f6dac49' into gingerbread-plus-aosp

* commit 'a2650db770e93a9424d6d6948fd31f943f6dac49':
  Fix SDK docs build.
2010-06-17 19:16:28 -07:00
Daniel Sandler
a2650db770 Merge "Fix SDK docs build." into gingerbread 2010-06-17 19:14:44 -07:00
Daniel Sandler
ae069f76ee Fix SDK docs build.
Change-Id: I2d11682cdf2cdcd48f0299f8c168fddd5994dc65
2010-06-17 21:56:26 -04:00
Dianne Hackborn
efd26c6b47 am 3f704e98: am 801700b1: am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Merge commit '3f704e983e36c668a3a13690655ab809666dfc3e'

* commit '3f704e983e36c668a3a13690655ab809666dfc3e':
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
2010-06-17 18:55:24 -07:00
Scott Main
0d049e5f62 am 0b16e6a0: am 7f0a1f62: am 5f11e95f: docs: small edits to catchup to edits made in html pushed live
Merge commit '0b16e6a0347c519ccf56b3b956c086889856fec3'

* commit '0b16e6a0347c519ccf56b3b956c086889856fec3':
  docs: small edits to catchup to edits made in html pushed live
2010-06-17 18:55:19 -07:00
James Dong
8698da75f7 am eaeec4b7: am 2bc48186: 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 'eaeec4b718a31595a4d50d01b917d7eb7b1376ab'

* commit 'eaeec4b718a31595a4d50d01b917d7eb7b1376ab':
  When filling the cache, we always time out waiting for a condition that won't occur.
2010-06-17 18:55:13 -07:00
Dianne Hackborn
3f704e983e am 801700b1: am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Merge commit '801700b1a2b3b5d3cf4264b62d8a776996bda4ca' into gingerbread-plus-aosp

* commit '801700b1a2b3b5d3cf4264b62d8a776996bda4ca':
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
2010-06-17 18:47:28 -07:00
Scott Main
0b16e6a034 am 7f0a1f62: am 5f11e95f: docs: small edits to catchup to edits made in html pushed live
Merge commit '7f0a1f62c63a91eab3bd21c65fa978c1b14650be' into gingerbread-plus-aosp

* commit '7f0a1f62c63a91eab3bd21c65fa978c1b14650be':
  docs: small edits to catchup to edits made in html pushed live
2010-06-17 18:47:25 -07:00
James Dong
eaeec4b718 am 2bc48186: 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 '2bc481861ab374f87c12b7bb816ff75ac46147f1' into gingerbread-plus-aosp

* commit '2bc481861ab374f87c12b7bb816ff75ac46147f1':
  When filling the cache, we always time out waiting for a condition that won't occur.
2010-06-17 18:47:22 -07:00
Dianne Hackborn
801700b1a2 am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Merge commit '57f4503e1a129d6a648f2378d36a060998a577a0' into gingerbread

* commit '57f4503e1a129d6a648f2378d36a060998a577a0':
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
2010-06-17 18:43:31 -07:00
Scott Main
7f0a1f62c6 am 5f11e95f: docs: small edits to catchup to edits made in html pushed live
Merge commit '5f11e95f0041e163e8aa9e429aec92c8ee942233' into gingerbread

* commit '5f11e95f0041e163e8aa9e429aec92c8ee942233':
  docs: small edits to catchup to edits made in html pushed live
2010-06-17 18:43:13 -07:00
James Dong
2bc481861a 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
a5cb3b87d6 Merge "Remove legacy drawing functions. Skip element names starting with '#'" 2010-06-17 18:06:42 -07:00
Jason Sams
6d1cf4148c Remove legacy drawing functions.
Skip element names starting with '#'

Change-Id: I6b0967ed1dc47c072c3bed7c0219e2215a7068a6
2010-06-17 18:05:38 -07:00
Vasu Nori
e8bf6dbc40 fix broken test similar to I32c30f7d05e5bec7c6b2776ce9a80c8be61d856f
Change-Id: Idf075ea888dfab35afba0a28a838e3a15b7de545
2010-06-17 16:54:56 -07:00
Jason Sams
aba8d30225 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
Jason Sams
020bb7b5ac Add skip to field packer.
remove hsb functions from env headers.
add RS_PACKED define for packed structures.

Change-Id: Idc661edff85c0047baa201f43e0839ac82c74593
2010-06-17 15:55:00 -07:00
Dianne Hackborn
57f4503e1a Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Modify UIModeManager to not get location updates every thirty minutes.
Instead it gets one once a day, and requests a new update when airplane
mode is turned off or the time zone changes.

Change-Id: I8044c27b5cd77709e4b872e2e8edd352f23e4af1
2010-06-17 15:49:33 -07:00
Vasu Nori
f3b0d6177b Merge "move a sqlite test from framework-tests to coretests" 2010-06-17 14:38:34 -07:00
Vasu Nori
0bcd289b99 move a sqlite test from framework-tests to coretests
Change-Id: Ic8d42a3c477e4ea0ad8eaa4e1869ae221b95ba46
2010-06-17 14:27:56 -07:00
Jaikumar Ganesh
cf990885da Merge "HID profile." 2010-06-17 13:58:49 -07:00
Jeff Brown
7cbd36f8d7 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
29f28cfe21 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
Jaikumar Ganesh
545e6708ad HID profile.
Change-Id: I52e965a6537bce02c751ba26fe7b44dd03832510
2010-06-17 13:49:25 -07:00
Jeff Brown
e899caf8cc Fixed api/current.xml after a bad merge.
Change-Id: I033f417e928eb541f0528521326b66776a3c9096
2010-06-17 13:49:02 -07:00
Romain Guy
3b970e78d2 Merge "Add libhwui, to hardware accelerate the Canvas API using OpenGL ES 2.0." 2010-06-17 13:42:37 -07:00
Romain Guy
e4d011201c Add libhwui, to hardware accelerate the Canvas API using OpenGL ES 2.0.
This is the initial checkin to setup the library and turn on OEGL ES 2.0
in ViewRoot, not a functional renderer.

Change-Id: I6655c54166e2967da2e21e7d6dcfba78bf113b44
2010-06-17 13:40:11 -07:00
Jeff Brown
4e74ae3d5b 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
42bb545a54 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
733c6f2e9b 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
c68b6e893a 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
5c225b1680 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
747f75dc08 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
04b4f781b1 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
3a0146cd29 Merge "New API for "immersive" activity windows." into gingerbread 2010-06-17 13:24:01 -07:00
Daniel Sandler
cc86c933f6 Merge "New API for high-priority Notifications and full-screen alerts." into gingerbread 2010-06-17 13:23:59 -07:00
Dave Sparks
6ab8346a03 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
121ac1e5a2 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
dbd9d79d7d 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