15002 Commits

Author SHA1 Message Date
Andreas Huber
2fadaf5634 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
19cbbb8b0f 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
5a25769584 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
111e602095 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
Fred Quintana
be62ddd4ee resolved conflicts for merge of eb393ce8 to master 2009-11-23 15:36:25 -08:00
Andreas Huber
5884468b44 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
1f52229453 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
d1f11997e5 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
dd6a5895f1 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
f7a5721895 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
e71a640886 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
Andreas Huber
1bceff916a 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:06:42 -08:00
Andreas Huber
24b0a95de7 The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps). 2009-11-23 14:04:48 -08:00
Dirk Dougherty
e0030418fd 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
b2796da2ed 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
eb393ce8ee 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
4174016dbd Merge change I53e3a20e into eclair-mr2
* changes:
  move SubscribedFeeds to GSF
2009-11-23 13:42:24 -08:00
Dirk Dougherty
bca9f1bbb3 sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Bug: 2160782
Change-Id: Ia576dc9b2312d89bbe194d94640c3cc79216067b
2009-11-23 13:23:46 -08:00
Android (Google) Code Review
0d631b9b58 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
74765f6eb2 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
4ddc2ed883 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
Fred Quintana
53e3a20e41 move SubscribedFeeds to GSF 2009-11-23 13:18:07 -08:00
Scott Main
ea5c440b4f 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
fa351d388d 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
98c11248be 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
Eric Olsen
e7096ebba1 Add logging of headset events to help debug issue.
Signed-off-by: Eric Olsen <eolsen@android.com>
2009-11-23 13:06:07 -08:00
Scott Main
3fa1cb059e 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
5e7f1fbe16 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
e5683369d2 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
543d9ca0cc 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
d9a3006649 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
Mike Lockwood
fb73f79340 Add window manager support for overriding button and keyboard backlight values.
The new backlightBrightness field works similarly as the existing WindowManager.LayoutParams.screenBrightness field

Needed for bugs:
    b/2233655 (under low ambient light the touch keys remain illuminated during video playback and never timeout)
    b/2221079 (Backlight for home/search/back/etc buttons should turn off when in dock in night mode)

Change-Id: I60dfecdc7bb653b0db38094464de651220b3d438
2009-11-23 15:16:55 -05:00
Grace Kloba
f40abf427e 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
13ea12044d 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
ed1624d8ff Merge change I8ae1b41a into eclair-mr2
* changes:
  Expose some debugging tools of the WebView.
2009-11-23 12:07:20 -08:00
Dan Egnor
596de923b2 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
9854deae10 Merge change I1691f3d3 into eclair
* changes:
  Add CPUFREQ_STATS event tag DO NOT MERGE
2009-11-23 11:57:08 -08:00
Eric Laurent
4883146af4 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
6ed9c32c04 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
132dab8f91 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
9d211f7bf7 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
1f0a0ed549 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
a0f9a4f735 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
Dianne Hackborn
4103924742 am 8abd5f0d: Fix issue #2267665 IME keyboard appears as Blank in compose view...
Merge commit '8abd5f0d519afa787e7c64e429df17ccc661ce75' into eclair-mr2

* commit '8abd5f0d519afa787e7c64e429df17ccc661ce75':
  Fix issue #2267665 IME keyboard appears as Blank in compose view...
2009-11-23 11:05:54 -08:00
Dianne Hackborn
8abd5f0d51 Fix issue #2267665 IME keyboard appears as Blank in compose view...
...if you re-lunch messaging application after deleting the
character and pressing home key

Change-Id: Idc7da05e54730958644e80069764237e5db6f288
2009-11-23 10:58:56 -08:00
Andreas Huber
e21fb34387 am 5493df91: am bbd6cb46: Merge change Ib1b7bce4 into eclair-mr2
Merge commit '5493df919b01952857eb3b78fad3fe2cff573935'

* commit '5493df919b01952857eb3b78fad3fe2cff573935':
  Squashed commit of the following:
2009-11-23 10:55:40 -08:00
Andreas Huber
5493df919b am bbd6cb46: Merge change Ib1b7bce4 into eclair-mr2
Merge commit 'bbd6cb463b405fc90912dee470fe6c7b8c6b1f54' into eclair-mr2-plus-aosp

* commit 'bbd6cb463b405fc90912dee470fe6c7b8c6b1f54':
  Squashed commit of the following:
2009-11-23 10:51:41 -08:00
Mike Lockwood
4f4915f23f am 1866591c: am 34c5813e: am 174b7269: Merge change Id886fb28 into eclair
Merge commit '1866591c192a434c3edcafb808e31b8262cadeb2'

* commit '1866591c192a434c3edcafb808e31b8262cadeb2':
  Fix deadlock in WindowManagerService.reenableKeyguard()
2009-11-23 10:51:25 -08:00
Android (Google) Code Review
bbd6cb463b Merge change Ib1b7bce4 into eclair-mr2
* changes:
  Squashed commit of the following:
2009-11-23 10:46:25 -08:00
Mike Lockwood
1866591c19 am 34c5813e: am 174b7269: Merge change Id886fb28 into eclair
Merge commit '34c5813e488fd4f044e545f177a20f553580ce6a' into eclair-mr2-plus-aosp

* commit '34c5813e488fd4f044e545f177a20f553580ce6a':
  Fix deadlock in WindowManagerService.reenableKeyguard()
2009-11-23 10:45:24 -08:00