Commit Graph

11788 Commits

Author SHA1 Message Date
Grace Kloba
9f2729ed6c am 4350e145: Move the full screen\'s matching embedded view to be fully visible so that the touch will always work.
Merge commit '4350e1451c9f884fabcabfda915b58a26c6ebf5f' into eclair-mr2-plus-aosp

* commit '4350e1451c9f884fabcabfda915b58a26c6ebf5f':
  Move the full screen's matching embedded view to be
2009-12-21 18:09:47 -08:00
Android (Google) Code Review
65d366e405 Merge change Ide2606dc
* changes:
  Don't perform app transition of the app is not currently visible.
2009-12-21 16:51:08 -08:00
Android (Google) Code Review
8e3f8ae7c8 Merge change I76d2295c
* changes:
  SIM toolkit: Phone app crashes while reading SIM card
2009-12-21 16:31:54 -08:00
Android (Google) Code Review
97b61af488 Merge change I83fd7b0d
* changes:
  frameworks/base: Handle broadcast sms properly
2009-12-21 16:29:34 -08:00
Android (Google) Code Review
eab76ad3bd Merge change I6b4d1294
* changes:
  DropBox logging of app & system server crashes.
2009-12-21 16:04:07 -08:00
Jean-Baptiste Queru
6fe591ef94 am c4978805: merge from open-source master
Merge commit 'c4978805dc8837570701629a9b8098e80804ad34'

* commit 'c4978805dc8837570701629a9b8098e80804ad34':
  ImageButton example doesn't work. Default state should be at the last.
  Time.parse3339 range checking and proper 'sec-frac' skip
2009-12-21 15:52:57 -08:00
Tom Taylor
689697be59 am d4a4729c: Update imports to android-common
Merge commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0' into eclair-mr2-plus-aosp

* commit 'd4a4729c0cac582a2dcec7c8cfb316b81885a0f0':
  Update imports to android-common
2009-12-21 15:44:34 -08:00
Jean-Baptiste Queru
78ffea7ef4 merge from open-source master 2009-12-21 15:32:25 -08:00
Android Code Review
97c7a443b7 Merge change I700e6d4d
* changes:
  Time.parse3339 range checking and proper 'sec-frac' skip
2009-12-21 15:14:02 -08:00
Jaikumar Ganesh
f901297671 am f5d2eec4: am 11b97c50: Merge change I551ed729 into eclair
Merge commit 'f5d2eec4fd530ac09ce1f8d2e51ea29b5cd12a38'

* commit 'f5d2eec4fd530ac09ce1f8d2e51ea29b5cd12a38':
  Use UNDEFINED priorities when unpaired.
2009-12-21 14:22:47 -08:00
Jaikumar Ganesh
e00381d73c am 1aa25597: am 87ed10d7: Merge change I577dd1f3 into eclair
Merge commit '1aa2559797d49fa0c6cf7885c9fed5797e42231f'

* commit '1aa2559797d49fa0c6cf7885c9fed5797e42231f':
  Accept incoming connections if no other sink is in NonDisconnecting state.
2009-12-21 14:22:37 -08:00
Jaikumar Ganesh
c85e5ac857 am 11b97c50: Merge change I551ed729 into eclair
Merge commit '11b97c50e6fb6d723e88eac3c125b60ca42184f7' into eclair-plus-aosp

* commit '11b97c50e6fb6d723e88eac3c125b60ca42184f7':
  Use UNDEFINED priorities when unpaired.
2009-12-21 14:19:50 -08:00
Jaikumar Ganesh
d9f1241527 am 87ed10d7: Merge change I577dd1f3 into eclair
Merge commit '87ed10d78d290f48d382a6e628241da0c61cfb45' into eclair-plus-aosp

* commit '87ed10d78d290f48d382a6e628241da0c61cfb45':
  Accept incoming connections if no other sink is in NonDisconnecting state.
2009-12-21 14:19:43 -08:00
Android (Google) Code Review
fb4fa224ae Merge change I551ed729 into eclair
* changes:
  Use UNDEFINED priorities when unpaired.
2009-12-21 14:17:15 -08:00
Android (Google) Code Review
87793027d4 Merge change I577dd1f3 into eclair
* changes:
  Accept incoming connections if no other sink is in NonDisconnecting state.
2009-12-21 14:16:44 -08:00
Scott Main
b46c807d43 am 186b94fe: am 74962e56: upload new dev site robots.txt to disallow old tutorial and samples directories (while old pages are still orphaned) and upload new sitemap including new resources pages.
Merge commit '186b94fe60a4cede177bace19b68c72c6f475190'

* commit '186b94fe60a4cede177bace19b68c72c6f475190':
  upload new dev site robots.txt to disallow old tutorial and
2009-12-21 14:08:34 -08:00
Scott Main
6698344e3d am 74962e56: upload new dev site robots.txt to disallow old tutorial and samples directories (while old pages are still orphaned) and upload new sitemap including new resources pages.
Merge commit '74962e56c5d625fe94a6bfc9cf1acd361382f0b6' into eclair-plus-aosp

* commit '74962e56c5d625fe94a6bfc9cf1acd361382f0b6':
  upload new dev site robots.txt to disallow old tutorial and
2009-12-21 13:46:28 -08:00
Tom Taylor
70d7e5653a am 497cf2b9: am 6a188713: Merge change I37f5ced1 into eclair-mr2
Merge commit '497cf2b9bf2a67d8e5492c3139624e6363ec59c1'

* commit '497cf2b9bf2a67d8e5492c3139624e6363ec59c1':
  Move various utility classes to android-common
2009-12-21 11:39:10 -08:00
Tom Taylor
6bbc151060 am 6a188713: Merge change I37f5ced1 into eclair-mr2
Merge commit '6a18871355f22bd0f91192e91345f48dff91f71a' into eclair-mr2-plus-aosp

* commit '6a18871355f22bd0f91192e91345f48dff91f71a':
  Move various utility classes to android-common
2009-12-21 11:26:32 -08:00
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