Commit Graph

8510 Commits

Author SHA1 Message Date
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
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
Andreas Huber
31fcc7860d 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
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
a1a631ccf5 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
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
Dan Egnor
39d27ccb1d am cd979d55: Merge change I494a1dc5 into eclair-mr2
Merge commit 'cd979d555fbf991bdc59b3521281786e78e809fc' into eclair-mr2-plus-aosp

* commit 'cd979d555fbf991bdc59b3521281786e78e809fc':
  Add OperationScheduler (and test) to the common static library;
2009-11-23 10:15:34 -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
41db67b4da am 40c1dbf0: am a59a01ab: Merge change I43f72dd1 into eclair
Merge commit '40c1dbf081035f878b96dd67ef112eb49001c087' into eclair-mr2-plus-aosp

* commit '40c1dbf081035f878b96dd67ef112eb49001c087':
  Don't block TIME_TICK broadcasts in the DigitalClock widget.
2009-11-23 08:50:12 -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
54390d3a30 am 8631e554: am ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit '8631e55425b2ab81eb74396e6834c6f7a4549804' into eclair-mr2-plus-aosp

* commit '8631e55425b2ab81eb74396e6834c6f7a4549804':
  Fix pairings lost on reboot.
2009-11-22 22:10:15 -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
7a724e46c7 am 949c572a: am e7800946: Merge change I49f02be9 into eclair
Merge commit '949c572a16881aa40079a42bf7682637b23eb16a' into eclair-mr2-plus-aosp

* commit '949c572a16881aa40079a42bf7682637b23eb16a':
  Issue 2265163: Audio still reported routed through earpiece on sholes
2009-11-21 00:26:09 -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
7d78485a6f am 30a4b8a1: am 256da9fb: am 160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '30a4b8a180813ae9a1846fdd7219ebe5592eb06b' into eclair-mr2-plus-aosp

* commit '30a4b8a180813ae9a1846fdd7219ebe5592eb06b':
  docs change for ESR: add platform notes document for
2009-11-20 17:12:37 -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
7009769d08 am dbf3d3ac: am af1f42be: Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit 'dbf3d3acc18f86a671096f1626d80d055bc36e11' into eclair-mr2-plus-aosp

* commit 'dbf3d3acc18f86a671096f1626d80d055bc36e11':
  Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
2009-11-20 16:49:21 -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
3c958879ae am f2900600: am 1824ec8c: Merge change If2b0bbed into eclair
Merge commit 'f29006000cfbcf7732df5d5432ab5ff8a2dbf691' into eclair-mr2-plus-aosp

* commit 'f29006000cfbcf7732df5d5432ab5ff8a2dbf691':
  Debugging for issue #2228381 android.view.InflateException
2009-11-20 15:26:50 -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
Wink Saville
baaf790873 am 79ff03a8: Merge change I3ae1fb19 into eclair-mr2
Merge commit '79ff03a84b8f6aa9fc95fba728a131e9c88d1b47' into eclair-mr2-plus-aosp

* commit '79ff03a84b8f6aa9fc95fba728a131e9c88d1b47':
  Increase the default wake lock timeout.
2009-11-20 15:04:31 -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
Ken Shirriff
c272ce3d37 am f8c2bb36: Add gservices flags for calendar sync.
Merge commit 'f8c2bb36f7b5d49553155559bc30c4e9211340e4' into eclair-mr2-plus-aosp

* commit 'f8c2bb36f7b5d49553155559bc30c4e9211340e4':
  Add gservices flags for calendar sync.
2009-11-20 14:35:22 -08:00
Evan Millar
f7813fc1bc am 288509a9: am 633177cb: Move updated 6.xml from eclair-sholes-release into eclair
Merge commit '288509a959d437d75b1cd706431e21ccf911531f' into eclair-mr2-plus-aosp

* commit '288509a959d437d75b1cd706431e21ccf911531f':
  Move updated 6.xml from eclair-sholes-release into eclair
2009-11-20 14:34:58 -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
Vasu Nori
c43f904bfa am 5a03f36e: maintain cache of statementids returned by sqlite upon compiling a sql stmnt
Merge commit '5a03f36ef845f73eb4473193dbb0f93dd12a51af' into eclair-mr2-plus-aosp

* commit '5a03f36ef845f73eb4473193dbb0f93dd12a51af':
  maintain cache of statementids returned by sqlite upon compiling a sql stmnt
2009-11-20 14:14:45 -08:00
Mike Lockwood
ff6daf2abd am 53e9c126: am a1ce6551: Merge change I69324a33 into eclair
Merge commit '53e9c126f5fc39459554f0290a2c863f645d397a' into eclair-mr2-plus-aosp

* commit '53e9c126f5fc39459554f0290a2c863f645d397a':
  AlarmManagerService: Fix daylight savings time offset computation
2009-11-20 13:36:14 -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
d7304b961f am d47fad27: am 055b4392: Merge change I0a17a960 into eclair
Merge commit 'd47fad27d76527dfa27f6c5425cc4074f6c3a158' into eclair-mr2-plus-aosp

* commit 'd47fad27d76527dfa27f6c5425cc4074f6c3a158':
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
2009-11-20 13:18:25 -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
Android (Google) Code Review
e4054e1a4c Merge change I0a17a960 into eclair
* changes:
  sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
2009-11-20 13:08:06 -08:00
Yu Shan Emily Lau
979d699d21 am 507322ca: am 9ed314ce: Merge change Ib3191441 into eclair
Merge commit '507322ca5c5b678714314ae87e27d07c89c40785' into eclair-mr2-plus-aosp

* commit '507322ca5c5b678714314ae87e27d07c89c40785':
  Add the checking for mediaplayer stress test.
2009-11-20 12:08:54 -08:00
Yu Shan Emily Lau
5d1b4f25b5 am 9ed314ce: Merge change Ib3191441 into eclair
Merge commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-mr2

* commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
  Add the checking for mediaplayer stress test.
2009-11-20 12:03:34 -08:00
Android (Google) Code Review
2840dde56b Merge change Ib3191441 into eclair
* changes:
  Add the checking for mediaplayer stress test.
2009-11-20 11:59:28 -08:00
Scott Main
3518be4011 am 0bbb68fe: am 2a6a149f: am 820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '0bbb68fe290e1c2e4b9c5722fc2dbbd29fc4e336' into eclair-mr2-plus-aosp

* commit '0bbb68fe290e1c2e4b9c5722fc2dbbd29fc4e336':
  docs change for ESD: add samples html pages for offline docs
2009-11-20 10:06:15 -08:00
Scott Main
8d51d5aadf am cb596642: am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed' into eclair-mr2-plus-aosp

* commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 10:05:56 -08:00
Scott Main
49a98fa51b am 2a6a149f: am 820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '2a6a149fc2abfb8ef654ed36ce4524209f5e33bc' into eclair-mr2

* commit '2a6a149fc2abfb8ef654ed36ce4524209f5e33bc':
  docs change for ESD: add samples html pages for offline docs
2009-11-20 10:00:55 -08:00
Scott Main
adea3166b5 am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-mr2

* commit 'e16113998bb10f39ee1384bfc497aceeeb193440':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 10:00:28 -08:00
Mike Lockwood
05c487b352 am 401a712e: IPowerManager: remove some unused methods.
Merge commit '401a712e3b3b41c77e79a130d7b07d653e18bcab' into eclair-mr2-plus-aosp

* commit '401a712e3b3b41c77e79a130d7b07d653e18bcab':
  IPowerManager: remove some unused methods.
2009-11-20 09:56:25 -08:00