Commit Graph

6120 Commits

Author SHA1 Message Date
Joe Onorato
69c25de21b am 55896f3c: Merge change Ib71193bf into eclair
Merge commit '55896f3c5121e73e3f657ed14e7ee8937ad72449' into eclair-mr2

* commit '55896f3c5121e73e3f657ed14e7ee8937ad72449':
  Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
2009-11-24 15:46:24 -08:00
Android (Google) Code Review
7af6912009 Merge change Ib71193bf into eclair
* changes:
  Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
2009-11-24 15:41:32 -08:00
Android (Google) Code Review
7465b84d14 Merge change I22cf0509 into eclair-mr2
* changes:
  Add China data to MccTable.
2009-11-24 15:19:28 -08:00
Dianne Hackborn
8cf09f0a6e am 118d92f7: Merge change I16925b91 into eclair
Merge commit '118d92f73fe9dd1cc9cb900205cd1ec0dac28a1b' into eclair-mr2

* commit '118d92f73fe9dd1cc9cb900205cd1ec0dac28a1b':
  Finish fixing issue #2228381: android.view.InflateException...
2009-11-24 15:01:51 -08:00
Android (Google) Code Review
8b967d2fab Merge change I16925b91 into eclair
* changes:
  Finish fixing issue #2228381: android.view.InflateException...
2009-11-24 14:43:53 -08:00
Mathias Agopian
bbced505c1 am 63851404: Merge change Ibf0c320a into eclair
Merge commit '638514048141bf9f28a4bede77b83c3238f5c194' into eclair-mr2

* commit '638514048141bf9f28a4bede77b83c3238f5c194':
  When using MDP, we needed to use a texture for diming.
2009-11-24 14:43:39 -08:00
Android (Google) Code Review
b972ff72ad Merge change Ic4cf6caa into eclair-mr2
* changes:
  Copy SYSTEM_LAST_KMSG from /proc/last_kmsg instead of /data/dontpanic/last_kmsg. (In preparation for not copying to /data/dontpanic/last_kmsg at all.)
2009-11-24 14:29:46 -08:00
Android (Google) Code Review
6d0e906926 Merge change Ibf0c320a into eclair
* changes:
  When using MDP, we needed to use a texture for diming.
2009-11-24 14:26:28 -08:00
Jim Miller
b5c943a89a am 35cdb484: Merge change I6c6c166b into eclair
Merge commit '35cdb484928b34fd517e49e200aa79aa64b4eeb4' into eclair-mr2

* commit '35cdb484928b34fd517e49e200aa79aa64b4eeb4':
  Fix 2268841: Updated portrait tab lockscreen to match latest PPL.
2009-11-24 14:04:44 -08:00
Android (Google) Code Review
978f4e5b07 Merge change I6c6c166b into eclair
* changes:
  Fix 2268841: Updated portrait tab lockscreen to match latest PPL.
2009-11-24 14:00:54 -08:00
Swarna Kumar
e6987ad74b am 7f8e3409: Merge change I816428ae into eclair
Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-mr2

* commit '7f8e34091efdee1a383280b08585f8254472c1fd':
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
2009-11-24 13:33:13 -08:00
Android (Google) Code Review
0467b21f5a Merge change I816428ae into eclair
* changes:
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness. Bug number : 2177113
2009-11-24 13:28:45 -08:00
Jason Sams
78d0cd8382 am 9dab667e: Force a crash under conditions where white square bug in all apps is likely to occur.
Merge commit '9dab667e03632181e487a04a8a170b3fa0bd5037' into eclair-mr2

* commit '9dab667e03632181e487a04a8a170b3fa0bd5037':
  Force a crash under conditions where white square bug in all apps is likely to occur.
2009-11-24 12:49:36 -08:00
Trevor Johns
c339d15d77 am 99f7b56f: Merge change Iefdb6f97 into eclair
Merge commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5' into eclair-mr2

* commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5':
  Fixing minor doc typo in android.widget.SimpleCursorAdapter.
2009-11-24 09:40:19 -08:00
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