Commit Graph

5994 Commits

Author SHA1 Message Date
Evan Millar
e8722a1309 am 5042f7ea: Unhide ContactsContract#QuickContact and fix sdk build
Merge commit '5042f7eae6baa6fa4f93248361e94eeb6894f90f' into eclair-plus-aosp

* commit '5042f7eae6baa6fa4f93248361e94eeb6894f90f':
  Unhide ContactsContract#QuickContact and fix sdk build
2009-09-30 22:13:29 -07:00
Robert Greenwalt
a8f7fd01d0 am e6b27966: Merge change I94132420 into eclair
Merge commit 'e6b27966fd7e181a52b35cd95937b935ba05783b' into eclair-plus-aosp

* commit 'e6b27966fd7e181a52b35cd95937b935ba05783b':
  Fix network-feature timeout code.
2009-09-30 21:48:10 -07:00
Grace Kloba
6d80d1c3bc am 9d33d953: Merge change I07729abd into eclair
Merge commit '9d33d953a04eb9288c8b842610baf24c164346aa' into eclair-plus-aosp

* commit '9d33d953a04eb9288c8b842610baf24c164346aa':
  Keep the scrollbar on during TOUCH_MOVE events even
2009-09-30 21:48:02 -07:00
Android (Google) Code Review
8eb9b0a200 Merge change I94132420 into eclair
* changes:
  Fix network-feature timeout code.
2009-10-01 00:43:51 -04:00
Android (Google) Code Review
0bac4c0afe Merge change I07729abd into eclair
* changes:
  Keep the scrollbar on during TOUCH_MOVE events even when there is no movement.
2009-10-01 00:41:21 -04:00
Fred Quintana
fb9d14d4ee am c868acf4: show events in the UI
Merge commit 'c868acf442a69429056a574c67a5e0187e2b9536' into eclair-plus-aosp

* commit 'c868acf442a69429056a574c67a5e0187e2b9536':
  show events in the UI
2009-09-30 21:38:23 -07:00
Jaikumar Ganesh
600746b211 am 8ad6d524: Merge change I55e15bad into eclair
Merge commit '8ad6d524e48d88ff9d5606cea0df56b4c1dafe28' into eclair-plus-aosp

* commit '8ad6d524e48d88ff9d5606cea0df56b4c1dafe28':
  Try to reconnect twice when the rfcomm error code is Connection Refused.
2009-09-30 21:19:46 -07:00
Evan Millar
854049e8fc am 35de7ef8: Merge change I98f2db38 into eclair
Merge commit '35de7ef84380975a229d5b984b63da23871738db' into eclair-plus-aosp

* commit '35de7ef84380975a229d5b984b63da23871738db':
  FastTrack->QuickContact
2009-09-30 21:19:38 -07:00
Robert Greenwalt
e98539e2fa am 7648bd1f: Merge change Ibb5626c5 into eclair
Merge commit '7648bd1f0005b869e87708b62442a8ad9884266a' into eclair-plus-aosp

* commit '7648bd1f0005b869e87708b62442a8ad9884266a':
  Stop bringing the wifi interface up on reset.
2009-09-30 21:18:57 -07:00
Grace Kloba
2515762972 am ade1aacf: Merge change Ic88b39e6 into eclair
Merge commit 'ade1aacf4cb9a43b85f0c70b145b42127c54f065' into eclair-plus-aosp

* commit 'ade1aacf4cb9a43b85f0c70b145b42127c54f065':
  Add the signature checking for WebView plugins. The
2009-09-30 21:17:58 -07:00
Christopher Tate
c2cbdd80e8 am 5f3c928f: Merge change Id93f4c9e into eclair
Merge commit '5f3c928f5ecdd2f41f238807c59241d34a02517e' into eclair-plus-aosp

* commit '5f3c928f5ecdd2f41f238807c59241d34a02517e':
  Turn off the last of the STOPSHIP verbose debugging
2009-09-30 21:17:46 -07:00
Wu-cheng Li
11c93e0cc7 am 5e5001bc: Merge change I7ed72bf5 into eclair
Merge commit '5e5001bc1a065f6d578b953b908052d623272fcd' into eclair-plus-aosp

* commit '5e5001bc1a065f6d578b953b908052d623272fcd':
  Add documentation for scene mode. Other parameters may be changed after setting scene mode.
2009-09-30 21:17:01 -07:00
Eric Laurent
ba45eff2ca am 3f56d21b: Merge change I89e74ba1 into eclair
Merge commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e' into eclair-plus-aosp

* commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e':
  Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
2009-09-30 21:16:47 -07:00
Jason Sams
36a2d320a2 am 0ec1bc60: Merge change Ie9ad9a71 into eclair
Merge commit '0ec1bc606ff9b1d7b2a7bbbaba39f971a794a9c0' into eclair-plus-aosp

* commit '0ec1bc606ff9b1d7b2a7bbbaba39f971a794a9c0':
  Implement screen aligned bitmap drawing support.
2009-09-30 21:16:31 -07:00
Eric Fischer
7dd9b43521 am 88f2acb0: Merge change Iec1f8a2e into eclair
Merge commit '88f2acb066f2b66a01807ad4f3d26ef575a1bf37' into eclair-plus-aosp

* commit '88f2acb066f2b66a01807ad4f3d26ef575a1bf37':
  Add Turkish accented letters for G and S on the hard keyboard.
2009-09-30 21:15:06 -07:00
Robert Greenwalt
aa77433b57 am 15a5bffb: Merge change Ie944f08b into eclair
Merge commit '15a5bffb7efc59895a92e6072717e001d2d9480c' into eclair-plus-aosp

* commit '15a5bffb7efc59895a92e6072717e001d2d9480c':
  Revert setDataEnabled to setting a master switch.
2009-09-30 21:14:49 -07:00
Jaikumar Ganesh
7917b85a5a am 4c9a29ef: Set Sink State when ACL disconnects.
Merge commit '4c9a29efdbf58034c1d90eb001dc7299f1f012ea' into eclair-plus-aosp

* commit '4c9a29efdbf58034c1d90eb001dc7299f1f012ea':
  Set Sink State when ACL disconnects.
2009-09-30 21:14:41 -07:00
Evan Millar
13500898a8 am 5eb7c9d3: Merge change Ifc9162c5 into eclair
Merge commit '5eb7c9d3e880032972c0d03dd34d9432fa7c719d' into eclair-plus-aosp

* commit '5eb7c9d3e880032972c0d03dd34d9432fa7c719d':
  Fix padding around QuickContactBadge in ContactHeaderWidget
2009-09-30 21:13:59 -07:00
Mike Lockwood
684a64a161 am 51cef844: Merge change Ic7e251a7 into eclair
Merge commit '51cef8440df1971f06e41eba8a87c58a225d4e8f' into eclair-plus-aosp

* commit '51cef8440df1971f06e41eba8a87c58a225d4e8f':
  Update SD card notification icons.
2009-09-30 21:13:50 -07:00
Jim Miller
01fc646d76 am 6988dd59: Merge change I792bb382 into eclair
Merge commit '6988dd59680ba4ec67c0e6ad14444e4763af8d01' into eclair-plus-aosp

* commit '6988dd59680ba4ec67c0e6ad14444e4763af8d01':
  Fix 2133205: Change the opacity to allow more of the background to be seen on locked screen
2009-09-30 21:13:42 -07:00
Christopher Tate
aab9746cd0 am 436344ae: Turn off most of the backup-related debug logging
Merge commit '436344ae12c819f58306ceb94241a266141e1218' into eclair-plus-aosp

* commit '436344ae12c819f58306ceb94241a266141e1218':
  Turn off most of the backup-related debug logging
2009-09-30 21:13:34 -07:00
Eric Laurent
10ac33ed14 am 7e1af37c: Merge change Ibe2085be into eclair
Merge commit '7e1af37c3148112d9c801272bfa6359a005baf6d' into eclair-plus-aosp

* commit '7e1af37c3148112d9c801272bfa6359a005baf6d':
  Fix issue 2153835: AudioFlinger: setParameters() can remain stuck if output thread is terminated.
2009-09-30 21:12:11 -07:00
Leon Scroggins
4e061dff24 am 10be7542: If the textfield is offscreen at the end of a zoom, remove it.
Merge commit '10be7542327e1d4483b33730164e5404ed48d73e' into eclair-plus-aosp

* commit '10be7542327e1d4483b33730164e5404ed48d73e':
  If the textfield is offscreen at the end of a zoom, remove it.
2009-09-30 21:12:02 -07:00
Android (Google) Code Review
aec1f42bc4 Merge change I55e15bad into eclair
* changes:
  Try to reconnect twice when the rfcomm error code is Connection Refused.
2009-10-01 00:00:17 -04:00
Android (Google) Code Review
9152ac7e9c Merge change I98f2db38 into eclair
* changes:
  FastTrack->QuickContact
2009-10-01 00:00:07 -04:00
Android (Google) Code Review
aaf1f5fd2a Merge change Ibb5626c5 into eclair
* changes:
  Stop bringing the wifi interface up on reset.
2009-09-30 23:43:58 -04:00
Android (Google) Code Review
fc5c1ff698 Merge change Ic88b39e6 into eclair
* changes:
  Add the signature checking for WebView plugins. The first one is for SampleBrowserPlugin. The second one is for Flash.
2009-09-30 23:17:17 -04:00
Android (Google) Code Review
6c31e869ab Merge change Id93f4c9e into eclair
* changes:
  Turn off the last of the STOPSHIP verbose debugging
2009-09-30 23:08:25 -04:00
Android (Google) Code Review
0b91b44511 Merge change I7ed72bf5 into eclair
* changes:
  Add documentation for scene mode. Other parameters may be changed after setting scene mode.
2009-09-30 22:48:02 -04:00
Android (Google) Code Review
a181c66905 Merge change I89e74ba1 into eclair
* changes:
  Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
2009-09-30 22:30:28 -04:00
Android (Google) Code Review
19988718d6 Merge change Ie9ad9a71 into eclair
* changes:
  Implement screen aligned bitmap drawing support.
2009-09-30 22:14:24 -04:00
Android (Google) Code Review
3808783d2e Merge change Iec1f8a2e into eclair
* changes:
  Add Turkish accented letters for G and S on the hard keyboard.
2009-09-30 21:06:56 -04:00
Android (Google) Code Review
60f11708c5 Merge change Ie944f08b into eclair
* changes:
  Revert setDataEnabled to setting a master switch.
2009-09-30 20:54:37 -04:00
Android (Google) Code Review
0b0e764e0b Merge change Ifc9162c5 into eclair
* changes:
  Fix padding around QuickContactBadge in ContactHeaderWidget
2009-09-30 20:26:25 -04:00
Android (Google) Code Review
8552b819d8 Merge change Ic7e251a7 into eclair
* changes:
  Update SD card notification icons.
2009-09-30 20:18:42 -04:00
Android (Google) Code Review
5453a59a99 Merge change I792bb382 into eclair
* changes:
  Fix 2133205: Change the opacity to allow more of the background to be seen on locked screen
2009-09-30 20:11:08 -04:00
Christopher Tate
e7e1009636 Turn off most of the backup-related debug logging
The core logging in BackupManagerService and in the Google backup transport are
still enabled at this point.

Change-Id: I10abfa565bbd1097dd3631051b6aca163e4af33a
2009-09-30 17:07:37 -07:00
Dianne Hackborn
e71a3d4d2f am 48e9a0dd: Merge change Ice5e9209 into eclair
Merge commit '48e9a0dd66b832cfaf668deba584394eba0ffdfc' into eclair-plus-aosp

* commit '48e9a0dd66b832cfaf668deba584394eba0ffdfc':
  Fix issue #2150258: Suggestions become inactive and do not respond when pressed.
2009-09-30 16:24:01 -07:00
Nick Pelly
95d490f481 am 78128d72: Merge change I2782ac8c into eclair
Merge commit '78128d721cdff2e035eab5da72819520f88affaf' into eclair-plus-aosp

* commit '78128d721cdff2e035eab5da72819520f88affaf':
  Fix regression.
2009-09-30 16:23:53 -07:00
Suchi Amalapurapu
80c00b99ac am 094e3e0b: Merge change Icb89d482 into eclair
Merge commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf' into eclair-plus-aosp

* commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf':
  Check if rename of backed up file fails before persisting new changes.
2009-09-30 16:23:45 -07:00
Android (Google) Code Review
2b2888c356 Merge change Ibe2085be into eclair
* changes:
  Fix issue 2153835: AudioFlinger: setParameters() can remain stuck if output thread is terminated.
2009-09-30 19:19:36 -04:00
Android (Google) Code Review
afe025714a Merge change Ice5e9209 into eclair
* changes:
  Fix issue #2150258: Suggestions become inactive and do not respond when pressed.
2009-09-30 18:47:45 -04:00
Android (Google) Code Review
f7be464645 Merge change I2782ac8c into eclair
* changes:
  Fix regression.
2009-09-30 18:38:55 -04:00
Android (Google) Code Review
954858858c Merge change Icb89d482 into eclair
* changes:
  Check if rename of backed up file fails before persisting new changes. If not these system services will end up with inconsistent settings files when the device runs out of storage. Delete mangled settings file in PackageManager if the current write fails so that we don't end up overwriting the backed up version with the mangled version Include null check when retrieving fwd locked resource for an existing package
2009-09-30 18:37:45 -04:00
Jaikumar Ganesh
d244ddab79 am b392c53f: Merge change Iba6fd660 into eclair
Merge commit 'b392c53f1f0bf3c757496295d5ad7a7d00ef151a' into eclair-plus-aosp

* commit 'b392c53f1f0bf3c757496295d5ad7a7d00ef151a':
  Set BondState to Bonding only if it not Bonded already.
2009-09-30 15:29:00 -07:00
Mathias Agopian
a57e06b100 am 98a9c56a: attempt to work around [2155085, 2150246] stuck in closeTransaction()
Merge commit '98a9c56acf1857adaf1773bd91c88a8364fd3fa8' into eclair-plus-aosp

* commit '98a9c56acf1857adaf1773bd91c88a8364fd3fa8':
  attempt to work around [2155085, 2150246] stuck in closeTransaction()
2009-09-30 15:28:52 -07:00
Android (Google) Code Review
4c82aa5ec4 Merge change Iba6fd660 into eclair
* changes:
  Set BondState to Bonding only if it not Bonded already.
2009-09-30 18:22:46 -04:00
Dianne Hackborn
b9df3f1615 am a33e3f79: Fix issue #2154794: Force close when start facebook application.
Merge commit 'a33e3f79259b56b03c7912af35944f34ad190e3c' into eclair-plus-aosp

* commit 'a33e3f79259b56b03c7912af35944f34ad190e3c':
  Fix issue #2154794: Force close when start facebook application.
2009-09-30 15:20:10 -07:00
Mathias Agopian
448f015966 attempt to work around [2155085, 2150246] stuck in closeTransaction() 2009-09-30 15:15:07 -07:00
Dan Egnor
57e2dddc91 am 46e462a3: Merge change I852f8e46 into eclair
Merge commit '46e462a380f90ed8101f9ac3f950a3c702772842' into eclair-plus-aosp

* commit '46e462a380f90ed8101f9ac3f950a3c702772842':
  Only re-initialize backup state if @pm@ metadata is missing,
2009-09-30 14:57:30 -07:00