Commit Graph

10599 Commits

Author SHA1 Message Date
Dave Sparks
50985781f4 am 94481bd7: am f52ebbfc: am 9a219519: Merge change I2d32301b into eclair
Merge commit '94481bd75541b227eb4325a3db5ee871cdc2b2dc'

* commit '94481bd75541b227eb4325a3db5ee871cdc2b2dc':
  Add 4 new notification sounds.
2009-11-23 17:55:36 -08:00
Dave Sparks
bdee35c247 am f52ebbfc: am 9a219519: Merge change I2d32301b into eclair
Merge commit 'f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb' into eclair-mr2-plus-aosp

* commit 'f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb':
  Add 4 new notification sounds.
2009-11-23 17:50:22 -08:00
Dave Sparks
afc95bb1f1 am 9a219519: Merge change I2d32301b into eclair
Merge commit '9a219519786ce6702c57ec1f1bffe2260fc663a9' into eclair-mr2

* commit '9a219519786ce6702c57ec1f1bffe2260fc663a9':
  Add 4 new notification sounds.
2009-11-23 17:45:57 -08:00
Android (Google) Code Review
75d632798a Merge change I2d32301b into eclair
* changes:
  Add 4 new notification sounds.
2009-11-23 17:42:41 -08:00
Jason Sams
d6b9353ee6 am 9f96a37a: am 6a2500a3: am 39dbb099: Merge change I36176536 into eclair
Merge commit '9f96a37aabbffffe719c1dfb73b5c437f190bcf0'

* commit '9f96a37aabbffffe719c1dfb73b5c437f190bcf0':
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:29:46 -08:00
Dianne Hackborn
3a3d6fc2b2 am 01d9fe1d: am cfe90ce4: am 05799981: Fix issue #2281046: Size and pressure don\'t change
Merge commit '01d9fe1d064af2394c82648c0ec7ffa721353889'

* commit '01d9fe1d064af2394c82648c0ec7ffa721353889':
  Fix issue #2281046: Size and pressure don't change
2009-11-23 16:29:11 -08:00
Jason Sams
8a2012eb37 am 6a2500a3: am 39dbb099: Merge change I36176536 into eclair
Merge commit '6a2500a330ef41cbfca40827b60e9f5efdf72db7' into eclair-mr2-plus-aosp

* commit '6a2500a330ef41cbfca40827b60e9f5efdf72db7':
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:24:17 -08:00
Jason Sams
b52be0759a am 39dbb099: Merge change I36176536 into eclair
Merge commit '39dbb099974f2c8e1154f28123e53be14c47a76d' into eclair-mr2

* commit '39dbb099974f2c8e1154f28123e53be14c47a76d':
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:19:37 -08:00
Android (Google) Code Review
9afbb82c5e Merge change I36176536 into eclair
* changes:
  Fix ref counting bug that could cause memory leak in allApps.
2009-11-23 16:14:13 -08:00
Andreas Huber
8809075b0a am 4bbdf934: am 44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.
Merge commit '4bbdf934458253dbdb331d2b614a085256ba8d6c'

* commit '4bbdf934458253dbdb331d2b614a085256ba8d6c':
  Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
2009-11-23 16:07:26 -08:00
Andreas Huber
8d2d13c4bd am 5884468b: am 1f522294: Merge change I24b0a95d into eclair-mr2
Merge commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5'

* commit '5884468b448a5e2810d2ae421b69cc9c18a1a2f5':
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
2009-11-23 16:06:56 -08:00
Andreas Huber
f3b1823ef2 am d1f11997: am e71a6408: Merge change I1bceff91 into eclair-mr2
Merge commit 'd1f11997e5845938b50a58dd3aecbc966ee00373'

* commit 'd1f11997e5845938b50a58dd3aecbc966ee00373':
  Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
2009-11-23 16:06:25 -08:00
Dirk Dougherty
f1948b6d80 am dd6a5895: am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Merge commit 'dd6a5895f1fe18fafdd78d96002618f2419f7979'

* commit 'dd6a5895f1fe18fafdd78d96002618f2419f7979':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
2009-11-23 16:05:56 -08:00
Eric Olsen
8b21e5a84b am f7a57218: am b2796da2: am 0d631b9b: Merge change Ie7096ebb into eclair
Merge commit 'f7a5721895ee95f4c7b58e8993fb03ec017dab85'

* commit 'f7a5721895ee95f4c7b58e8993fb03ec017dab85':
  Add logging of headset events to help debug issue.
2009-11-23 16:05:25 -08:00
Dianne Hackborn
e89c65c5a4 am cfe90ce4: am 05799981: Fix issue #2281046: Size and pressure don\'t change
Merge commit 'cfe90ce461eacf3ae6a8556594a0f682a31cfb84' into eclair-mr2-plus-aosp

* commit 'cfe90ce461eacf3ae6a8556594a0f682a31cfb84':
  Fix issue #2281046: Size and pressure don't change
2009-11-23 16:03:16 -08:00
Dianne Hackborn
065b6c82f9 am 05799981: Fix issue #2281046: Size and pressure don\'t change
Merge commit '05799981d8d930e0b929cdb99f9407e3ee18c142' into eclair-mr2

* commit '05799981d8d930e0b929cdb99f9407e3ee18c142':
  Fix issue #2281046: Size and pressure don't change
2009-11-23 15:58:18 -08:00
Andreas Huber
f7bc8a8d6e am 44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.
Merge commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8' into eclair-mr2-plus-aosp

* commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8':
  Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
2009-11-23 15:39:26 -08:00
Fred Quintana
d036db1a6d resolved conflicts for merge of eb393ce8 to master 2009-11-23 15:36:25 -08:00
Andreas Huber
56d1e9cc60 am 1f522294: Merge change I24b0a95d into eclair-mr2
Merge commit '1f52229453c3df8eaeda64133bd332b01589354f' into eclair-mr2-plus-aosp

* commit '1f52229453c3df8eaeda64133bd332b01589354f':
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
2009-11-23 14:42:30 -08:00
Android (Google) Code Review
a4097f7b0d Merge change I24b0a95d into eclair-mr2
* changes:
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
2009-11-23 14:39:03 -08:00
Andreas Huber
b08b53684c am e71a6408: Merge change I1bceff91 into eclair-mr2
Merge commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e' into eclair-mr2-plus-aosp

* commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e':
  Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
2009-11-23 14:31:25 -08:00
Dirk Dougherty
160c54359d am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Merge commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c' into eclair-mr2-plus-aosp

* commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
2009-11-23 14:31:01 -08:00
Eric Olsen
13d17cdc0b am b2796da2: am 0d631b9b: Merge change Ie7096ebb into eclair
Merge commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f' into eclair-mr2-plus-aosp

* commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f':
  Add logging of headset events to help debug issue.
2009-11-23 14:30:35 -08:00
Android (Google) Code Review
2902c21f71 Merge change I1bceff91 into eclair-mr2
* changes:
  Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
2009-11-23 14:26:46 -08:00
Dirk Dougherty
0ef6f5d2de am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Merge commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e' into eclair-mr2

* commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e':
  sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
2009-11-23 13:55:50 -08:00
Eric Olsen
738af02c4a am 0d631b9b: Merge change Ie7096ebb into eclair
Merge commit '0d631b9b58db54bee58da717b38b8020bc3d0437' into eclair-mr2

* commit '0d631b9b58db54bee58da717b38b8020bc3d0437':
  Add logging of headset events to help debug issue.
2009-11-23 13:55:25 -08:00
Fred Quintana
c41f0e3b84 am 4174016d: Merge change I53e3a20e into eclair-mr2
Merge commit '4174016dbd043eda493e9cd1925ed84549c7b3c0' into eclair-mr2-plus-aosp

* commit '4174016dbd043eda493e9cd1925ed84549c7b3c0':
  move SubscribedFeeds to GSF
2009-11-23 13:47:00 -08:00
Android (Google) Code Review
95aafb7519 Merge change I53e3a20e into eclair-mr2
* changes:
  move SubscribedFeeds to GSF
2009-11-23 13:42:24 -08:00
Android (Google) Code Review
d5e377df7b Merge change Ie7096ebb into eclair
* changes:
  Add logging of headset events to help debug issue.
2009-11-23 13:20:46 -08:00
Scott Main
2cb95bcf11 am ea5c440b: am 98c11248: am 3fa1cb05: am 5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit 'ea5c440b4fba2f2f21aa0db898db3ad27b2c8be8'

* commit 'ea5c440b4fba2f2f21aa0db898db3ad27b2c8be8':
  droiddoc change: add flag to offline docs build to signal
2009-11-23 13:18:47 -08:00
Mike Lockwood
c404ccfd5f am fa351d38: am e5683369: Merge change I60dfecdc into eclair-mr2
Merge commit 'fa351d388d0441432f4e616ef87a5c97a088dd04'

* commit 'fa351d388d0441432f4e616ef87a5c97a088dd04':
  Add window manager support for overriding button and keyboard backlight values.
2009-11-23 13:18:19 -08:00
Scott Main
a983f4dfa1 am 98c11248: am 3fa1cb05: am 5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '98c11248becafa61d29aea8a7e10adf418a6c197' into eclair-mr2-plus-aosp

* commit '98c11248becafa61d29aea8a7e10adf418a6c197':
  droiddoc change: add flag to offline docs build to signal
2009-11-23 13:14:01 -08:00
Mike Lockwood
1af4a2e1c3 am e5683369: Merge change I60dfecdc into eclair-mr2
Merge commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a' into eclair-mr2-plus-aosp

* commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a':
  Add window manager support for overriding button and keyboard backlight values.
2009-11-23 13:13:39 -08:00
Scott Main
738ab46d2a am 3fa1cb05: am 5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '3fa1cb059e76d8b83634a4117a7b2ceca438ae7e' into eclair-mr2

* commit '3fa1cb059e76d8b83634a4117a7b2ceca438ae7e':
  droiddoc change: add flag to offline docs build to signal
2009-11-23 13:09:17 -08:00
Scott Main
aba8577a07 am 5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '5e7f1fbe161d7015dde6e893351238749f906c8a' into eclair

* commit '5e7f1fbe161d7015dde6e893351238749f906c8a':
  droiddoc change: add flag to offline docs build to signal
2009-11-23 13:04:27 -08:00
Android (Google) Code Review
ac6da24e2c Merge change Id2ee762d into eclair-sdk
* changes:
  droiddoc change: add flag to offline docs build to signal that we're building offline docs so that we do not generate all of the web pages for the sample apps source code.
2009-11-23 12:56:19 -08:00
Android (Google) Code Review
10c599b89a Merge change I60dfecdc into eclair-mr2
* changes:
  Add window manager support for overriding button and keyboard backlight values.
2009-11-23 12:20:04 -08:00
Grace Kloba
2ee433da2f am f40abf42: am ed1624d8: Merge change I8ae1b41a into eclair-mr2
Merge commit 'f40abf427e614b850dfb3723622af3e6039a9815'

* commit 'f40abf427e614b850dfb3723622af3e6039a9815':
  Expose some debugging tools of the WebView.
2009-11-23 12:17:33 -08:00
Dan Egnor
aa65820e6f am 13ea1204: am 596de923: am 9854deae: (-s ours) Merge change I1691f3d3 into eclair
Merge commit '13ea12044d03f3e5b2f98eddd442afe5acf69485'

* commit '13ea12044d03f3e5b2f98eddd442afe5acf69485':
  Add CPUFREQ_STATS event tag
2009-11-23 12:17:08 -08:00
Grace Kloba
fa2db33734 am ed1624d8: Merge change I8ae1b41a into eclair-mr2
Merge commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b' into eclair-mr2-plus-aosp

* commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b':
  Expose some debugging tools of the WebView.
2009-11-23 12:12:52 -08:00
Dan Egnor
0d6b765a2a am 596de923: am 9854deae: (-s ours) Merge change I1691f3d3 into eclair
Merge commit '596de923b23744e693967e1f3a644bb60c3ab30b' into eclair-mr2-plus-aosp

* commit '596de923b23744e693967e1f3a644bb60c3ab30b':
  Add CPUFREQ_STATS event tag
2009-11-23 12:12:28 -08:00
Android (Google) Code Review
89c3bb12e8 Merge change I8ae1b41a into eclair-mr2
* changes:
  Expose some debugging tools of the WebView.
2009-11-23 12:07:20 -08:00
Dan Egnor
7a340949f6 am 9854deae: (-s ours) Merge change I1691f3d3 into eclair
Merge commit '9854deae10aaf39999a95e440ee3dec939d47179' into eclair-mr2

* commit '9854deae10aaf39999a95e440ee3dec939d47179':
  Add CPUFREQ_STATS event tag
2009-11-23 12:03:47 -08:00
Android (Google) Code Review
6222af9f43 Merge change I1691f3d3 into eclair
* changes:
  Add CPUFREQ_STATS event tag DO NOT MERGE
2009-11-23 11:57:08 -08:00
Eric Laurent
838d56075a am 6ed9c32c: am 132dab8f: am a0f9a4f7: Merge change I2083b297 into eclair
Merge commit '6ed9c32c04d7f57bf66835c481a17b254762cea3'

* commit '6ed9c32c04d7f57bf66835c481a17b254762cea3':
  Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
2009-11-23 11:25:58 -08:00
Eric Laurent
7dd2a5ee74 am 132dab8f: am a0f9a4f7: Merge change I2083b297 into eclair
Merge commit '132dab8f91f5e87581660069753f238ea9914732' into eclair-mr2-plus-aosp

* commit '132dab8f91f5e87581660069753f238ea9914732':
  Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
2009-11-23 11:21:01 -08:00
Eric Laurent
8effb8cdcf am a0f9a4f7: Merge change I2083b297 into eclair
Merge commit 'a0f9a4f73579c2afa4dd82499a69abce94a3f23f' into eclair-mr2

* commit 'a0f9a4f73579c2afa4dd82499a69abce94a3f23f':
  Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
2009-11-23 11:16:27 -08:00
Dianne Hackborn
43d704e6c0 am 1f0a0ed5: am 41039247: am 8abd5f0d: Fix issue #2267665 IME keyboard appears as Blank in compose view...
Merge commit '1f0a0ed549f79c4ad6d783c93319d6807ab88847'

* commit '1f0a0ed549f79c4ad6d783c93319d6807ab88847':
  Fix issue #2267665 IME keyboard appears as Blank in compose view...
2009-11-23 11:15:56 -08:00
Dianne Hackborn
9534b733db am 41039247: am 8abd5f0d: Fix issue #2267665 IME keyboard appears as Blank in compose view...
Merge commit '4103924742c376716ce5866f6d2f53eac4f3cb59' into eclair-mr2-plus-aosp

* commit '4103924742c376716ce5866f6d2f53eac4f3cb59':
  Fix issue #2267665 IME keyboard appears as Blank in compose view...
2009-11-23 11:12:04 -08:00
Android (Google) Code Review
d654470dfe Merge change I2083b297 into eclair
* changes:
  Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
2009-11-23 11:11:55 -08:00