Commit Graph

4196 Commits

Author SHA1 Message Date
Nick Pelly
e3eb19e357 am b078d6ef: Merge change 22803 into eclair
Merge commit 'b078d6ef7c83df156ff2f6bac48df26a2766bf5d' into eclair-plus-aosp

* commit 'b078d6ef7c83df156ff2f6bac48df26a2766bf5d':
  Add uuids to adb shell dumpsys bluetooth
2009-08-26 14:12:44 -07:00
Android (Google) Code Review
6a00779e59 Merge change 22772 into eclair
* changes:
  New List and Tab assets.
2009-08-26 14:10:19 -07:00
Android (Google) Code Review
18effe65fb Merge change 22803 into eclair
* changes:
  Add uuids to adb shell dumpsys bluetooth
2009-08-26 14:07:41 -07:00
Nick Pelly
4a8cacf5aa am d41c5776: Merge change 22768 into eclair
Merge commit 'd41c577684785eecd3ffa848aafae759e5889731' into eclair-plus-aosp

* commit 'd41c577684785eecd3ffa848aafae759e5889731':
  Fix authorization check for Audio Source.
2009-08-26 14:05:20 -07:00
Android (Google) Code Review
5d1cbf6769 Merge change 22768 into eclair
* changes:
  Fix authorization check for Audio Source.
2009-08-26 14:03:15 -07:00
Android (Google) Code Review
38b2189723 Merge change 22090 into donut
* changes:
      docs only.     add new documentation for installing the new winusb driver.     also add a link to the HTC support site for ADP flashing     and remove references to the G1 and generalize to "consumer devices"
2009-08-26 12:55:54 -07:00
Mike Lockwood
1c2d65aab8 am 23b1a470: Merge change 22769 into eclair
Merge commit '23b1a470081e6b3c56ada4c43863ca7ed48c3ad2' into eclair-plus-aosp

* commit '23b1a470081e6b3c56ada4c43863ca7ed48c3ad2':
  MountService: Launch UsbStorageActivity with Intent.FLAG_ACTIVITY_NEW_TASK flag.
2009-08-26 12:27:51 -07:00
Android (Google) Code Review
2b5f5eeba1 Merge change 22769 into eclair
* changes:
  MountService: Launch UsbStorageActivity with Intent.FLAG_ACTIVITY_NEW_TASK flag.
2009-08-26 12:25:55 -07:00
Fred Quintana
a98c9dbc52 am 2d5a14d6: Merge change 22732 into eclair
Merge commit '2d5a14d6bf2bbc5a7e895cd4a0b977dd2f297532' into eclair-plus-aosp

* commit '2d5a14d6bf2bbc5a7e895cd4a0b977dd2f297532':
  clean up the too many deletes dialog
2009-08-26 11:49:35 -07:00
Android (Google) Code Review
2b7a098a05 Merge change 22732 into eclair
* changes:
  clean up the too many deletes dialog
2009-08-26 11:47:20 -07:00
Bjorn Bringert
aeda5888e6 am 98d88588: am ba223760: Close suggestion cursors that arrive after adapter is closed
Merge commit '98d8858890227861c5dc28bc7acee9b1adedda45' into eclair-plus-aosp

* commit '98d8858890227861c5dc28bc7acee9b1adedda45':
  Close suggestion cursors that arrive after adapter is closed
2009-08-26 11:44:09 -07:00
Bjorn Bringert
ddc02e32aa am ba223760: Close suggestion cursors that arrive after adapter is closed
Merge commit 'ba223760895e62ad2fcb85476984cb29018860c9' into eclair

* commit 'ba223760895e62ad2fcb85476984cb29018860c9':
  Close suggestion cursors that arrive after adapter is closed
2009-08-26 11:41:40 -07:00
Andreas Huber
2878c3067a am 4b8e3fb5: Merge change 22777 into eclair
Merge commit '4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf' into eclair-plus-aosp

* commit '4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf':
  Disregard the EOS buffer flag while flushing or shutting down the decoder.
2009-08-26 10:40:33 -07:00
Android (Google) Code Review
7d1622eeec Merge change 22777 into eclair
* changes:
  Disregard the EOS buffer flag while flushing or shutting down the decoder.
2009-08-26 10:38:53 -07:00
Andreas Huber
16d6ed72be am c27bff91: Merge change 22774 into eclair
Merge commit 'c27bff913a2c9c4a1f42b00951740cf139cb19ad' into eclair-plus-aosp

* commit 'c27bff913a2c9c4a1f42b00951740cf139cb19ad':
  Added a commandline option to "stagefright" that limits decoding to a maximum number of frames per iteration.
2009-08-26 10:32:51 -07:00
Andreas Huber
12d00037ae am 867bb7c3: Merge change 22773 into eclair
Merge commit '867bb7c3538cc66c378a695996cf8290a8774491' into eclair-plus-aosp

* commit '867bb7c3538cc66c378a695996cf8290a8774491':
  Keep up with latest changes to overlay handling on that unnamable platform.
2009-08-26 10:32:47 -07:00
Android (Google) Code Review
ff64600806 Merge change 22774 into eclair
* changes:
  Added a commandline option to "stagefright" that limits decoding to a maximum number of frames per iteration.
2009-08-26 10:30:56 -07:00
Android (Google) Code Review
2714e0f214 Merge change 22773 into eclair
* changes:
  Keep up with latest changes to overlay handling on that unnamable platform.
2009-08-26 10:30:31 -07:00
Evan Millar
7dd3461fb8 am ea839a72: Merge change 22766 into eclair
Merge commit 'ea839a72fd68e0b796e6dd2384de1447d06d9b62' into eclair-plus-aosp

* commit 'ea839a72fd68e0b796e6dd2384de1447d06d9b62':
  Add assets for fasttrack badges.
2009-08-26 10:22:06 -07:00
Android (Google) Code Review
95955fee8c Merge change 22766 into eclair
* changes:
  Add assets for fasttrack badges.
2009-08-26 10:20:30 -07:00
Eric Laurent
58b7288e36 am 6ee9952b: Fix issue 2076322: AudioService, too many stream volume steps.
Merge commit '6ee9952bc20be72b9419cb653c9e2e833889a3d3' into eclair-plus-aosp

* commit '6ee9952bc20be72b9419cb653c9e2e833889a3d3':
  Fix issue 2076322: AudioService, too many stream volume steps.
2009-08-26 08:52:28 -07:00
Ben Murdoch
073ef9032e am d497d876: Pass the estimated size of new HTML 5 databases to the ChromeClient so it can use that amount to figure an initial default quota.
Merge commit 'd497d87650dd79f7d6a4751d79598d68ceb4b789' into eclair-plus-aosp

* commit 'd497d87650dd79f7d6a4751d79598d68ceb4b789':
  Pass the estimated size of new HTML 5 databases to the ChromeClient so it can use that amount to figure an initial default quota.
2009-08-26 04:43:39 -07:00
Daisuke Miyakawa
307bec4a81 am 97f87095: Merge change 22399 into eclair
Merge commit '97f870956a37d441f82e21135a5e68d3ecdd0bf5' into eclair-plus-aosp

* commit '97f870956a37d441f82e21135a5e68d3ecdd0bf5':
  Refactor VCard handling code, phase 2, 3, 4, 5
2009-08-25 22:10:36 -07:00
Android (Google) Code Review
56e29c6624 Merge change 22399 into eclair
* changes:
  Refactor VCard handling code, phase 2, 3, 4, 5
2009-08-25 22:08:38 -07:00
Jeff Sharkey
a047da7e26 am ba176d6c: Don\'t reference hidden API from comments.
Merge commit 'ba176d6c8ad581e65b46bd6835c0737e74ef453d' into eclair-plus-aosp

* commit 'ba176d6c8ad581e65b46bd6835c0737e74ef453d':
  Don't reference hidden API from comments.
2009-08-25 19:08:00 -07:00
Martin Storsjo
ea4cab67bd am 09f4c942: Merge change 22710 into eclair
Merge commit '09f4c94233502eeb19d4a4c8f05cd331e64c4992' into eclair-plus-aosp

* commit '09f4c94233502eeb19d4a4c8f05cd331e64c4992':
  Calculate specular lighting correctly
2009-08-25 18:38:21 -07:00
Martin Storsjo
ce223a97b5 am 22874300: Merge change 22709 into eclair
Merge commit '228743001721e5b167d393523ad35d78ba965195' into eclair-plus-aosp

* commit '228743001721e5b167d393523ad35d78ba965195':
  If FLAGS_2D_PROJECTION is set, the MVP matrices need updating when changing the viewport.
2009-08-25 18:38:17 -07:00
Android (Google) Code Review
e4066eabe1 Merge change 22710 into eclair
* changes:
  Calculate specular lighting correctly
2009-08-25 18:36:47 -07:00
Android (Google) Code Review
6cc34a1962 Merge change 22709 into eclair
* changes:
  If FLAGS_2D_PROJECTION is set, the MVP matrices need updating when changing the viewport.
2009-08-25 18:36:22 -07:00
Martin Storsjo
e03eaa1551 Calculate specular lighting correctly
Since the lighting calculations are done in object space, the vector
from the object to the viewer also needs to be transformed to object
space.
2009-08-25 18:35:54 -07:00
Martin Storsjo
d914215edf If FLAGS_2D_PROJECTION is set, the MVP matrices need updating when changing the viewport. 2009-08-25 18:35:03 -07:00
Dmitri Plotnikov
9e74129513 am 22e2aaaa: Merge change 22656 into eclair
Merge commit '22e2aaaa5cb465679320e1027240d5150f574706' into eclair-plus-aosp

* commit '22e2aaaa5cb465679320e1027240d5150f574706':
  Adding an aggregation mode: AGGREGATION_SUSPENDED
2009-08-25 18:34:53 -07:00
Android (Google) Code Review
4462dfd190 Merge change 22656 into eclair
* changes:
  Adding an aggregation mode: AGGREGATION_SUSPENDED
2009-08-25 18:33:13 -07:00
Fred Quintana
9821b298e8 am 16c758fb: Merge change 22702 into eclair
Merge commit '16c758fb156cc8184e9c3ace7aa4717af4bb05ea' into eclair-plus-aosp

* commit '16c758fb156cc8184e9c3ace7aa4717af4bb05ea':
  run the sync thread at background priority
2009-08-25 17:44:08 -07:00
Android (Google) Code Review
7a261bb219 Merge change 22702 into eclair
* changes:
  run the sync thread at background priority
2009-08-25 17:42:26 -07:00
Jeff Sharkey
21fed4554b am 534aa012: Mark all legacy contacts APIs as deprecated.
Merge commit '534aa012b5063abeaa36b9ade69851add8b7a48f' into eclair-plus-aosp

* commit '534aa012b5063abeaa36b9ade69851add8b7a48f':
  Mark all legacy contacts APIs as deprecated.
2009-08-25 17:32:43 -07:00
Eric Fischer
3334db633b am 5439f4e3: Merge change 22665 into eclair
Merge commit '5439f4e30300084beb3f1ecbb19bcfd1bcac9e5d' into eclair-plus-aosp

* commit '5439f4e30300084beb3f1ecbb19bcfd1bcac9e5d':
  Decapitalize "Input method" in context menu.
2009-08-25 17:26:00 -07:00
Android (Google) Code Review
1ee9a3b69b Merge change 22665 into eclair
* changes:
  Decapitalize "Input method" in context menu.
2009-08-25 17:24:58 -07:00
Jason Sams
ab7c167f9e am 1af7258c: Merge change 22695 into eclair
Merge commit '1af7258c907f5ad148226d5dcbd188fd75facbfb' into eclair-plus-aosp

* commit '1af7258c907f5ad148226d5dcbd188fd75facbfb':
  Remove bogus comments and logging.
2009-08-25 17:13:16 -07:00
Android (Google) Code Review
81b5d3a6d4 Merge change 22695 into eclair
* changes:
  Remove bogus comments and logging.
2009-08-25 17:10:56 -07:00
johnwang
9f34524802 am cc907741: Merge change 22660 into eclair
Merge commit 'cc907741b9b7344820ffbc8d68992567d74d0f4b' into eclair-plus-aosp

* commit 'cc907741b9b7344820ffbc8d68992567d74d0f4b':
  Simplify data icons of CDMA in status bar.
2009-08-25 16:20:12 -07:00
Android (Google) Code Review
ae8428ff74 Merge change 22660 into eclair
* changes:
  Simplify data icons of CDMA in status bar.
2009-08-25 16:18:32 -07:00
Robert Greenwalt
51a055d49b am 8d61d005: Merge change 22638 into eclair
Merge commit '8d61d005839b23a41034325d5f458f1344933b1b' into eclair-plus-aosp

* commit '8d61d005839b23a41034325d5f458f1344933b1b':
  Fix the removal of dns entries.
2009-08-25 16:13:26 -07:00
Android (Google) Code Review
d27dc77286 Merge change 22638 into eclair
* changes:
  Fix the removal of dns entries.
2009-08-25 16:11:47 -07:00
Mike Lockwood
d675ff51fd am ca5362ce: Merge change 22674 into eclair
Merge commit 'ca5362cec4954366f8c1dc011bd14264c8381646' into eclair-plus-aosp

* commit 'ca5362cec4954366f8c1dc011bd14264c8381646':
  GpsLocationProvider: Default to AGPS on if the setting is missing.
2009-08-25 16:06:36 -07:00
Android (Google) Code Review
946c2678fc Merge change 22674 into eclair
* changes:
  GpsLocationProvider: Default to AGPS on if the setting is missing.
2009-08-25 16:05:26 -07:00
Mike Lockwood
b0e531cd32 am 0de065e6: Merge change 22661 into eclair
Merge commit '0de065e68cc2141513c5b45643123ecb2947858c' into eclair-plus-aosp

* commit '0de065e68cc2141513c5b45643123ecb2947858c':
  SettingsProvider: Fix botched merge from donut to eclair.
2009-08-25 16:02:07 -07:00
Android (Google) Code Review
ad9437d65c Merge change 22661 into eclair
* changes:
  SettingsProvider: Fix botched merge from donut to eclair.
2009-08-25 16:00:54 -07:00
Dianne Hackborn
58fcc677ab am 9acc030b: Implement issue #2071750: add a pre-boot upgrade step.
Merge commit '9acc030be474db2bc2371440a12cbdc478238689' into eclair-plus-aosp

* commit '9acc030be474db2bc2371440a12cbdc478238689':
  Implement issue #2071750: add a pre-boot upgrade step.
2009-08-25 15:34:26 -07:00
Jack Wang
af4c31708f am 1e09e9e0: Merge change 22650 into eclair
Merge commit '1e09e9e0d09602ee84a299f09b451db686ff6c40' into eclair-plus-aosp

* commit '1e09e9e0d09602ee84a299f09b451db686ff6c40':
  Fix build break
2009-08-25 15:34:21 -07:00