Commit Graph

11619 Commits

Author SHA1 Message Date
Android (Google) Code Review
a508091007 Merge change I37f5ced1 into eclair-mr2
* changes:
  Move various utility classes to android-common
2009-12-21 09:59:25 -08:00
Android (Google) Code Review
6c9e7f47d3 Merge change I66a4a6e4
* changes:
  Fix merge conflict markers that accidentally got checked in.
2009-12-21 01:42:43 -08:00
Android (Google) Code Review
c9c6dd33b3 Merge change I21799450
* changes:
  Fix bug 2325244	screen turns black for a brief period of time
2009-12-20 22:51:43 -08:00
Grace Kloba
92c80d3a43 am fb2fbefd: am 9a67c820: Address the multiple resizing during initializing problem adobe run into.
Merge commit 'fb2fbefd6fa3b6503522dc24214295122c3d4f31'

* commit 'fb2fbefd6fa3b6503522dc24214295122c3d4f31':
  Address the multiple resizing during initializing
2009-12-20 11:37:30 -08:00
Grace Kloba
e679046745 am 9a67c820: Address the multiple resizing during initializing problem adobe run into.
Merge commit '9a67c82089e43d37f5038c74b0e1dca8edc4ac8a' into eclair-mr2-plus-aosp

* commit '9a67c82089e43d37f5038c74b0e1dca8edc4ac8a':
  Address the multiple resizing during initializing
2009-12-20 11:34:57 -08:00
Scott Main
a1c2e5d0bc am 5508987b: am e4c2a376: Merge change I2703edac into eclair
Merge commit '5508987bfcdd9a441966893ee21c6cf7803c0b49'

* commit '5508987bfcdd9a441966893ee21c6cf7803c0b49':
  docs: add new device features for the uses-feature
2009-12-19 12:36:05 -08:00
Scott Main
d4a56ac92e am e4c2a376: Merge change I2703edac into eclair
Merge commit 'e4c2a37624612c9708d0767f8643a10502e6887a' into eclair-plus-aosp

* commit 'e4c2a37624612c9708d0767f8643a10502e6887a':
  docs: add new device features for the uses-feature
2009-12-19 12:33:00 -08:00
Android (Google) Code Review
c717b34fa1 Merge change I2703edac into eclair
* changes:
  docs: add new device features for the uses-feature manifest element and edit some other pieces.
2009-12-19 12:30:15 -08:00
James Dong
bb750606b3 am 122fe7e1: am 4d0e827d: Attempt to fix simular build break. Missing header file stdlib.h for free, malloc, etc
Merge commit '122fe7e10297ce51d63b6076a33573d217f3f1cc'

* commit '122fe7e10297ce51d63b6076a33573d217f3f1cc':
  Attempt to fix simular build break.
2009-12-19 09:03:27 -08:00
James Dong
15611480e3 am 4d0e827d: Attempt to fix simular build break. Missing header file stdlib.h for free, malloc, etc
Merge commit '4d0e827d0be6085893428b420ec5800f1973a43b' into eclair-mr2-plus-aosp

* commit '4d0e827d0be6085893428b420ec5800f1973a43b':
  Attempt to fix simular build break.
2009-12-19 09:00:17 -08:00
James Dong
4c78a37088 am 2473eb4a: am 4e4795c8: Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
Merge commit '2473eb4a33b226758e1f5db322cb8d687ce01602'

* commit '2473eb4a33b226758e1f5db322cb8d687ce01602':
  Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
2009-12-19 08:29:59 -08:00
James Dong
74f5930e62 am 4e4795c8: Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
Merge commit '4e4795c8c0934eb063048471037ecb8a713e85fd' into eclair-mr2-plus-aosp

* commit '4e4795c8c0934eb063048471037ecb8a713e85fd':
  Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable
2009-12-19 08:26:03 -08:00
Scott Main
954131e1e5 am 9a6c8168: am 77fa05a4: Merge change Iab5952e1 into eclair
Merge commit '9a6c8168f743c1dc8cc28de22fe12be4623434cd'

* commit '9a6c8168f743c1dc8cc28de22fe12be4623434cd':
  docs: add "required" attribute to the <uses-feature> docs
2009-12-19 00:41:10 -08:00
Scott Main
a12298e6f1 am 77fa05a4: Merge change Iab5952e1 into eclair
Merge commit '77fa05a43d3f3f967311d6806fe743017950cf92' into eclair-plus-aosp

* commit '77fa05a43d3f3f967311d6806fe743017950cf92':
  docs: add "required" attribute to the <uses-feature> docs
2009-12-19 00:39:26 -08:00
Android (Google) Code Review
4821a83057 Merge change Iab5952e1 into eclair
* changes:
  docs: add "required" attribute to the <uses-feature> docs and add a note to the CAMERA permission stating that it enables the <uses-feature> for camera. This is an incrimental update for the 2.0.1 docs. More changes to come for the 2.1 docs to include more features
2009-12-19 00:36:48 -08:00
Dirk Dougherty
6960251578 am 27e13685: am 4d5a0645: doc change: add 7 diffs report.
Merge commit '27e136854f156a7896b35c1140125568c33b4737'

* commit '27e136854f156a7896b35c1140125568c33b4737':
  doc change: add 7 diffs report.
2009-12-19 00:20:16 -08:00
Dirk Dougherty
ea18801a0f am 4d5a0645: doc change: add 7 diffs report.
Merge commit '4d5a0645535edd6c15e834df8ab9519652d71038' into eclair-plus-aosp

* commit '4d5a0645535edd6c15e834df8ab9519652d71038':
  doc change: add 7 diffs report.
2009-12-19 00:17:27 -08:00
Scott Main
47e9afd4f7 am b9b9764b: am 673b9378: Merge change Ie4b0d302 into eclair
Merge commit 'b9b9764bbbd668c1bd30a09d7c2c02b684731892'

* commit 'b9b9764bbbd668c1bd30a09d7c2c02b684731892':
  docs: update the site homepage with 2.1 announcement
2009-12-18 17:19:03 -08:00
Scott Main
b04be5c5aa am a2bca747: am a25032a0: Merge change Ic31c0f62 into eclair
Merge commit 'a2bca7477d803541c5a48cc7624e2b6c305c5970'

* commit 'a2bca7477d803541c5a48cc7624e2b6c305c5970':
  docs: update the Bluetooth guide with links to the sample
2009-12-18 17:18:54 -08:00
Scott Main
b32120627a am 673b9378: Merge change Ie4b0d302 into eclair
Merge commit '673b937889d550700d9d4a80aefeedd5ebf3ecb4' into eclair-plus-aosp

* commit '673b937889d550700d9d4a80aefeedd5ebf3ecb4':
  docs: update the site homepage with 2.1 announcement
2009-12-18 17:15:45 -08:00
Scott Main
61fa71fe2d am a25032a0: Merge change Ic31c0f62 into eclair
Merge commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad' into eclair-plus-aosp

* commit 'a25032a08d1cce601c0a52057bc39d9c7e47bfad':
  docs: update the Bluetooth guide with links to the sample
2009-12-18 17:15:38 -08:00
Android (Google) Code Review
fbd84af451 Merge change Ie4b0d302 into eclair
* changes:
  docs: update the site homepage with 2.1 announcement
2009-12-18 17:13:53 -08:00
Android (Google) Code Review
9fa550aa36 Merge change Ic31c0f62 into eclair
* changes:
  docs: update the Bluetooth guide with links to the sample app, scrub the sibling files, and revise the Bluetooth package summary to point to the BT dev guide.
2009-12-18 17:12:36 -08:00
Jim Miller
e5efdc584a am 5ee51f07: am 05de7c88: Merge change I420cc110 into eclair-mr2
Merge commit '5ee51f07356b81ff2b026ef864f2f6349994e3fc'

* commit '5ee51f07356b81ff2b026ef864f2f6349994e3fc':
  Fix 2318046: Modify PIN entry layout in keyguard so it works well on HVGA as well as WVGA devices.
2009-12-18 16:16:05 -08:00
Dianne Hackborn
016b83a252 am 47c38f00: am 558947c9: Issue #2335763: Cant dial emergency number on my device
Merge commit '47c38f00ab464a8fdb6ae2d819ae189c17b72410'

* commit '47c38f00ab464a8fdb6ae2d819ae189c17b72410':
  Issue #2335763: Cant dial emergency number on my device
2009-12-18 16:14:34 -08:00
Dianne Hackborn
0a8282b33c am 558947c9: Issue #2335763: Cant dial emergency number on my device
Merge commit '558947c9899627067d632e8a6365f77a35f433e1' into eclair-plus-aosp

* commit '558947c9899627067d632e8a6365f77a35f433e1':
  Issue #2335763: Cant dial emergency number on my device
2009-12-18 16:11:08 -08:00
Jim Miller
288fa08d80 am 05de7c88: Merge change I420cc110 into eclair-mr2
Merge commit '05de7c882e0ae8d9ea10f4de9421b2e05bf29fa9' into eclair-mr2-plus-aosp

* commit '05de7c882e0ae8d9ea10f4de9421b2e05bf29fa9':
  Fix 2318046: Modify PIN entry layout in keyguard so it works well on HVGA as well as WVGA devices.
2009-12-18 16:10:31 -08:00
Android (Google) Code Review
bd1865f659 Merge change I420cc110 into eclair-mr2
* changes:
  Fix 2318046: Modify PIN entry layout in keyguard so it works well on HVGA as well as WVGA devices.
2009-12-18 16:07:19 -08:00
Android (Google) Code Review
8ea7a99732 Merge change I3632fede
* changes:
  Bug 2330278
2009-12-18 15:31:49 -08:00
Robert Greenwalt
03f64b625e am 24317443: am 421c72b6: Cleanup of process-specific DNS.
Merge commit '24317443fde973c762afbea1a3f6f2c830dfe3dd'

* commit '24317443fde973c762afbea1a3f6f2c830dfe3dd':
  Cleanup of process-specific DNS.
2009-12-18 14:37:28 -08:00
Robert Greenwalt
82f10dff2d am 421c72b6: Cleanup of process-specific DNS.
Merge commit '421c72b6773582dd1473ace44c42d4e0ee1287e3' into eclair-mr2-plus-aosp

* commit '421c72b6773582dd1473ace44c42d4e0ee1287e3':
  Cleanup of process-specific DNS.
2009-12-18 14:33:55 -08:00
Android (Google) Code Review
f9e6c844e9 Merge change Ic854f281
* changes:
  Force a re-layout of children if ListView is out of sync with the adapter in onFocusChanged. Addresses bug 2157773
2009-12-18 12:14:05 -08:00
Android (Google) Code Review
efa6d5b2c8 Merge change I68afd01e
* changes:
  Move texture bindings to base program object.  Change ProgramFragment creation to require a texture format in 1.0 mode.
2009-12-18 12:01:34 -08:00
Gloria Wang
8c672b0037 am 254e0025: am 791c626a: Merge change Ibac388a3 into eclair-mr2
Merge commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542'

* commit '254e00253ce72ee7252c26aab3a9ec6fb72e0542':
  Add support for XING header
2009-12-18 10:37:42 -08:00
Gloria Wang
35e7f03d54 am 791c626a: Merge change Ibac388a3 into eclair-mr2
Merge commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233' into eclair-mr2-plus-aosp

* commit '791c626addcb30c6fbe3522aa7e1afe86ce4d233':
  Add support for XING header
2009-12-18 10:34:18 -08:00
Android (Google) Code Review
79720249c9 Merge change Ibac388a3 into eclair-mr2
* changes:
  Add support for XING header
2009-12-18 10:30:37 -08:00
Android (Google) Code Review
ea63fce6c6 Merge change I1d1ed967
* changes:
  Tap delays; making tap UI feel better. Addresses bug 2317577
2009-12-18 10:11:02 -08:00
Android (Google) Code Review
2cb612448c Merge change I89107c15
* changes:
  Updated test GridTouchVerticalSpacingStackFromBottomTest for larger screens. Addresses bug 2176089 http://b/issue?id=2176089 Now takes into account screen scaling.
2009-12-18 10:10:46 -08:00
Android (Google) Code Review
04572008d3 Merge change I58acbafc
* changes:
  Fix for http://b/issue?id=2323459 and generics correctness on a WeakReference
2009-12-18 10:10:28 -08:00
Tom Taylor
466d65e3c1 Move various utility classes to android-common
In the process of making Mms unbundled, copy a few non-public-API
classes into the android-common library. The Mms app now uses this
library. The next step is to update the other apps that use these classes
and then delete the classes from their original location.
2009-12-18 10:08:35 -08:00
Mike Reed
70893acb87 am 750a64ac: am 6888f559: Merge change If0c93a57 into eclair-mr2
Merge commit '750a64aca07faf032f1e3ea40cee840d34be0d2c'

* commit '750a64aca07faf032f1e3ea40cee840d34be0d2c':
  add DragTracker class
2009-12-18 09:57:37 -08:00
James Dong
6ce1c33841 am 5614c2c6: am 02f5b544: Initial checkins of the mpeg4 and h263 software decoders based on PV
Merge commit '5614c2c677ce08561c93c6385dc3090dbf5760dc'

* commit '5614c2c677ce08561c93c6385dc3090dbf5760dc':
  Initial checkins of the mpeg4 and h263 software decoders based on PV
2009-12-18 09:57:22 -08:00
Mike Reed
6ce158472e am 6888f559: Merge change If0c93a57 into eclair-mr2
Merge commit '6888f559ba215abd210df749c3ef63706d0bc56a' into eclair-mr2-plus-aosp

* commit '6888f559ba215abd210df749c3ef63706d0bc56a':
  add DragTracker class
2009-12-18 09:53:26 -08:00
Android (Google) Code Review
7dab0912cb Merge change If0c93a57 into eclair-mr2
* changes:
  add DragTracker class
2009-12-18 09:50:57 -08:00
Android (Google) Code Review
cbc7399f77 Merge change I9c401646
* changes:
  Rework the LRU list for hidden and empty processes.
2009-12-17 18:12:26 -08:00
Dirk Dougherty
0e1b75b944 am 98a48f0f: am 5da76ddd: doc change: Add ?details query to doc about Android Market.
Merge commit '98a48f0fd3af5fec833dab44da17f8911e95d147'

* commit '98a48f0fd3af5fec833dab44da17f8911e95d147':
  doc change: Add ?details query to doc about Android Market.
2009-12-17 17:38:49 -08:00
Dirk Dougherty
7766e32b6d am 5da76ddd: doc change: Add ?details query to doc about Android Market.
Merge commit '5da76ddd575b22d45bbea0155f62c7c32e1a510e' into eclair-plus-aosp

* commit '5da76ddd575b22d45bbea0155f62c7c32e1a510e':
  doc change: Add ?details query to doc about Android Market.
2009-12-17 17:35:58 -08:00
Android (Google) Code Review
1bfd3c1766 Merge change I2278137e
* changes:
  Disable HTTP playback and metadata support in stagefright, use PV instead.
2009-12-17 14:26:37 -08:00
James Dong
384ba171e9 am 02f5b544: Initial checkins of the mpeg4 and h263 software decoders based on PV
Merge commit '02f5b5447de349216a40086ca6061efefb5a3025' into eclair-mr2-plus-aosp

* commit '02f5b5447de349216a40086ca6061efefb5a3025':
  Initial checkins of the mpeg4 and h263 software decoders based on PV
2009-12-17 13:30:55 -08:00
Android (Google) Code Review
f644c002bb Merge change I38e951b6
* changes:
  Write HierarchyViewer's data in UTF-8.
2009-12-17 13:30:11 -08:00