Android (Google) Code Review
8968df6355
Merge change Iefdb6f97 into eclair
...
* changes:
Fixing minor doc typo in android.widget.SimpleCursorAdapter.
2009-11-24 09:35:35 -08:00
Mathias Agopian
2f0a0a58f6
When using MDP, we needed to use a texture for diming.
2009-11-23 22:41:36 -08:00
Dave Sparks
3ecaac9bec
am 16cc72bd: Fix simulator build.
...
Merge commit '16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-mr2
* commit '16cc72bdef471ffeee3f61eba8262783de248b04':
Fix simulator build.
2009-11-23 19:58:33 -08:00
Dave Sparks
82ca96b1e8
am 8424ec32: Merge change I0f9a53d4 into eclair
...
Merge commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013' into eclair-mr2
* commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013':
Set metadata retriever thread group to the caller's group.
2009-11-23 19:58:00 -08:00
Android (Google) Code Review
f68fa23ecd
Merge change I06fb08c4 into eclair-mr2
...
* changes:
Expand db_operation logging to prepare for widespread sample collection: - always enable the log, but subsample for queries faster than 100ms - add information about whether it's blocking a main thread - log the entire sql (have not yet added quoted-string-stripping)
2009-11-23 19:10:17 -08:00
Android (Google) Code Review
3b70ddd2f6
Merge change I0f9a53d4 into eclair
...
* changes:
Set metadata retriever thread group to the caller's group.
2009-11-23 17:58:24 -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
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
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
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
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
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
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
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
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
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
Dianne Hackborn
4e8fd3c394
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
Android (Google) Code Review
2dff44b33d
Merge change Ib1b7bce4 into eclair-mr2
...
* changes:
Squashed commit of the following:
2009-11-23 10:46:25 -08:00
Mike Lockwood
8e43ef26fe
am 174b7269: Merge change Id886fb28 into eclair
...
Merge commit '174b726917c12d61f9135a180afc8413d845dc2d' into eclair-mr2
* commit '174b726917c12d61f9135a180afc8413d845dc2d':
Fix deadlock in WindowManagerService.reenableKeyguard()
2009-11-23 10:40:13 -08:00
Android (Google) Code Review
634014cfb4
Merge change Id886fb28 into eclair
...
* changes:
Fix deadlock in WindowManagerService.reenableKeyguard()
2009-11-23 10:36:32 -08:00
Android (Google) Code Review
a61586697a
Merge change I494a1dc5 into eclair-mr2
...
* changes:
Add OperationScheduler (and test) to the common static library; includes new string parsing function (and test).
2009-11-23 10:10:51 -08:00
Daniel Sandler
7e63f1b1b6
am a59a01ab: Merge change I43f72dd1 into eclair
...
Merge commit 'a59a01ab2b959a8a5aeb09dd664d5be193fd8219' into eclair-mr2
* commit 'a59a01ab2b959a8a5aeb09dd664d5be193fd8219':
Don't block TIME_TICK broadcasts in the DigitalClock widget.
2009-11-23 08:44:27 -08:00
Android (Google) Code Review
8c6e00e512
Merge change I43f72dd1 into eclair
...
* changes:
Don't block TIME_TICK broadcasts in the DigitalClock widget.
2009-11-23 08:39:24 -08:00
Jaikumar Ganesh
30f1f8832c
am ad431ad8: Merge change Ia3acc2ee into eclair
...
Merge commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2
* commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60':
Fix pairings lost on reboot.
2009-11-22 22:02:17 -08:00
Android (Google) Code Review
9497c089ff
Merge change Ia3acc2ee into eclair
...
* changes:
Fix pairings lost on reboot.
2009-11-22 21:54:29 -08:00
Dan Egnor
a649612e68
Add OperationScheduler (and test) to the common static library;
...
includes new string parsing function (and test).
2009-11-21 10:09:46 -08:00
Eric Laurent
91c95f655d
am e7800946: Merge change I49f02be9 into eclair
...
Merge commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff' into eclair-mr2
* commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff':
Issue 2265163: Audio still reported routed through earpiece on sholes
2009-11-21 00:21:15 -08:00
Android (Google) Code Review
151f4f6027
Merge change I49f02be9 into eclair
...
* changes:
Issue 2265163: Audio still reported routed through earpiece on sholes
2009-11-21 00:18:24 -08:00
Scott Main
e63efc8888
am 256da9fb: am 160ab363: Merge change I0c172ebf into eclair-sdk
...
Merge commit '256da9fb007ac0722a5b1854befda7e7bed2564e' into eclair-mr2
* commit '256da9fb007ac0722a5b1854befda7e7bed2564e':
docs change for ESR: add platform notes document for
2009-11-20 17:08:09 -08:00
Scott Main
4933a90e0c
am 160ab363: Merge change I0c172ebf into eclair-sdk
...
Merge commit '160ab363d738728456d561bb80d54d3448e7580a' into eclair
* commit '160ab363d738728456d561bb80d54d3448e7580a':
docs change for ESR: add platform notes document for
2009-11-20 17:03:29 -08:00
Android (Google) Code Review
369464469f
Merge change I0c172ebf into eclair-sdk
...
* changes:
docs change for ESR: add platform notes document for Android 2.0.1. Also update the homepage sdk and adp announcements.
2009-11-20 16:59:57 -08:00
Dianne Hackborn
7d59cbc168
am af1f42be: Fix issue #2271668 : Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
...
Merge commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d' into eclair-mr2
* commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d':
Fix issue #2271668 : Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
2009-11-20 16:43:20 -08:00
Dianne Hackborn
d653512adf
am 1824ec8c: Merge change If2b0bbed into eclair
...
Merge commit '1824ec8c127e3a8ef602d027e3c10d81f28320e8' into eclair-mr2
* commit '1824ec8c127e3a8ef602d027e3c10d81f28320e8':
Debugging for issue #2228381 android.view.InflateException
2009-11-20 15:20:34 -08:00
Android (Google) Code Review
e12c29dabb
Merge change If2b0bbed into eclair
...
* changes:
Debugging for issue #2228381 android.view.InflateException
2009-11-20 15:12:33 -08:00
Android (Google) Code Review
8b5e7153a5
Merge change I3ae1fb19 into eclair-mr2
...
* changes:
Increase the default wake lock timeout.
2009-11-20 14:56:21 -08:00
Dianne Hackborn
7b92d7ec36
Debugging for issue #2228381 android.view.InflateException
...
Binary XML file line #37 : Error inflating class <unknown> after adding a secondary account
Now that I have these debug logs, I want to keep them since they will make
debugging these kinds of issues a lot easier in the future. (Note in this
case there was no problem in the framework.)
Change-Id: If2b0bbeda4706b7c5dc1ba4a5db04b74f40e1543
2009-11-20 14:26:42 -08:00
Evan Millar
c1a5945f8b
am 633177cb: Move updated 6.xml from eclair-sholes-release into eclair
...
Merge commit '633177cbdc21b9e8f2153069965fb6aa30b8cb8f' into eclair-mr2
* commit '633177cbdc21b9e8f2153069965fb6aa30b8cb8f':
Move updated 6.xml from eclair-sholes-release into eclair
2009-11-20 14:22:30 -08:00
Mike Lockwood
fc0c6e00d1
am a1ce6551: Merge change I69324a33 into eclair
...
Merge commit 'a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2' into eclair-mr2
* commit 'a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2':
AlarmManagerService: Fix daylight savings time offset computation
2009-11-20 13:32:17 -08:00
Android (Google) Code Review
24e763c21a
Merge change I69324a33 into eclair
...
* changes:
AlarmManagerService: Fix daylight savings time offset computation
2009-11-20 13:28:12 -08:00
Dirk Dougherty
1ac40cdfdc
am 055b4392: Merge change I0a17a960 into eclair
...
Merge commit '055b439289f38c5a1d3bd43c0e218a4cbb93773d' into eclair-mr2
* commit '055b439289f38c5a1d3bd43c0e218a4cbb93773d':
sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
2009-11-20 13:13:25 -08:00