11265 Commits

Author SHA1 Message Date
Jeff Hamilton
151259df5c am 082c2af6: EventLog when a database file is deleted due to corruption.
Merge commit '082c2af6859dff103e781b372dfde927cc0f869f'

* commit '082c2af6859dff103e781b372dfde927cc0f869f':
  EventLog when a database file is deleted due to corruption.
2009-10-07 14:01:13 -07:00
The Android Open Source Project
e57e043fa2 am 21aa747f: Merge commit \'remotes/goog/eclair\' into eclair-release
Merge commit '21aa747f28d20bc34dc2969d5a7f67356e0eb141'

* commit '21aa747f28d20bc34dc2969d5a7f67356e0eb141':
2009-10-07 14:01:05 -07:00
The Android Open Source Project
897801c62d am e41f3517: Merge commit \'remotes/goog/eclair\' into eclair-release
Merge commit 'e41f3517be1aadf68574e4b18104400acdccc950'

* commit 'e41f3517be1aadf68574e4b18104400acdccc950':
2009-10-07 14:00:56 -07:00
Christopher Tate
3bfb76459e am 00db92e7: Don\'t forget to clear "backup in progress" state when finishing a pass
Merge commit '00db92e7e4ff53d658cffc8f42a3e0783cb1e2b0'

* commit '00db92e7e4ff53d658cffc8f42a3e0783cb1e2b0':
  Don't forget to clear "backup in progress" state when finishing a pass
2009-10-07 14:00:49 -07:00
Dianne Hackborn
ecd90f59ea am df72b14f: Fix issue #2148939: Sholes slow to wake up in landscape mode
Merge commit 'df72b14fae157d56ec549877b71a250ccca3f08e'

* commit 'df72b14fae157d56ec549877b71a250ccca3f08e':
  Fix issue #2148939: Sholes slow to wake up in landscape mode
2009-10-07 14:00:39 -07:00
Robert Greenwalt
56ccae6948 Merge commit '44685eb4' into manualmerge
Conflicts:
	telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
2009-10-07 12:14:19 -07:00
The Android Open Source Project
a06e03d0ed am 2caa215a: Merge commit \'remotes/goog/eclair\' into eclair-release
Merge commit '2caa215a64f493ef26cbaaf1663ccd16dda9de28'

* commit '2caa215a64f493ef26cbaaf1663ccd16dda9de28':
2009-10-07 11:06:34 -07:00
android-build SharedAccount
b78082e9f2 am e89fec34: Merge commit \'goog/eclair\' into eclair-release
Merge commit 'e89fec340c15da38f6e7e9a9cceccd0734fb16eb'

* commit 'e89fec340c15da38f6e7e9a9cceccd0734fb16eb':
2009-10-07 11:06:25 -07:00
Android (Google) Code Review
279770107d am d14c5398: Merge change 26821 into eclair
Merge commit 'd14c53989820f2d12e58bcdd6872609baed827d5'

* commit 'd14c53989820f2d12e58bcdd6872609baed827d5':
  Merge change 26821 into eclair
2009-10-07 11:06:17 -07:00
Grace Kloba
c167db57b9 resolved conflicts for merge of bf54f02b to master 2009-10-07 09:42:35 -07:00
Android (Google) Code Review
1bdec993cf am 8c2623e9: Merge change 26908 into eclair
Merge commit '8c2623e9978a517bda6429f01f486ef1755a0be8'

* commit '8c2623e9978a517bda6429f01f486ef1755a0be8':
  Merge change 26908 into eclair
2009-10-07 09:26:05 -07:00
Doug Kwan
b1bb6cfe91 Add back missing shared libraries used in executables in link commands. These
executables have calls to some shared libraries without explicitly linking
them.  Currently it works as linker links these libraries via dependencies of
other libraries.  This is fragile and not the right thing to do.
2009-10-04 19:27:57 -07:00
Elliott Hughes
82583b8312 Remove last vestiges of adb networking support.
Bug: 1122968
2009-10-02 12:31:08 -07:00
Android (Google) Code Review
88d32062bc Merge change Ibdced0b5
* changes:
  Remove unused #includes.
2009-10-02 13:47:48 -04:00
Elliott Hughes
bdced0b58c Remove unused #includes.
(Part of removing adb networking support.)

Bug: 1122968
2009-10-01 17:50:23 -07:00
Marco Nelissen
e22a43664e am 88be4cb5: am 9b150b74: Close the cursor before assigning a new one to the same variable.
Merge commit '88be4cb5ee6718a971f18cc14a5699204d28e082'

* commit '88be4cb5ee6718a971f18cc14a5699204d28e082':
  Close the cursor before assigning a new one to the same variable.
2009-10-01 15:12:55 -07:00
Daniel Sandler
813f2f24a9 am 8da45e9e: am 87b94b13: Merge change I6e01fa52 into eclair
Merge commit '8da45e9ee989df2215a49552609713d817c076ef'

* commit '8da45e9ee989df2215a49552609713d817c076ef':
  Remove unneeded icon.
2009-10-01 15:12:44 -07:00
Michael Chan
5567725510 am 50bd2992: am 5a463a69: Merge change Ic2a16d4f into eclair
Merge commit '50bd2992b1917d14c5bc79659820e4017c7e049c'

* commit '50bd2992b1917d14c5bc79659820e4017c7e049c':
  b/2148252 Fix emulator
2009-10-01 15:12:26 -07:00
Mike Reed
e253e96c91 am bd2973db: am bbed0d68: hide setGammaForText, which is only used for calibrating new devices
Merge commit 'bd2973db0b0c2354b2ca793beed5048e66fbd023'

* commit 'bd2973db0b0c2354b2ca793beed5048e66fbd023':
  hide setGammaForText, which is only used for calibrating new devices
2009-10-01 15:11:49 -07:00
Jeff Sharkey
6c453148ad am b28e9c9e: am c00099ef: Change intent flags for launching FastTrack.
Merge commit 'b28e9c9ebe811e62eda912285e091f26f53cce9b'

* commit 'b28e9c9ebe811e62eda912285e091f26f53cce9b':
  Change intent flags for launching FastTrack.
2009-10-01 15:11:30 -07:00
Mathias Agopian
033a4aaa2f am 3d9d5fc0: am 271cfe85: Merge change Ia8826d67 into eclair
Merge commit '3d9d5fc063777b42cd51d7020f126685c8138ce5'

* commit '3d9d5fc063777b42cd51d7020f126685c8138ce5':
  improve boot animation a bit
2009-10-01 14:01:10 -07:00
Bjorn Bringert
d0c37132a5 am 51654b56: am a6309c30: On BACK in search, hide just IME if IME is fullscreen
Merge commit '51654b562b3faaf358b55124ad5290847bdceabd'

* commit '51654b562b3faaf358b55124ad5290847bdceabd':
  On BACK in search, hide just IME if IME is fullscreen
2009-10-01 14:00:42 -07:00
Bjorn Bringert
832d627a18 am 38325cb2: am 95c98dd5: Merge change Ie69a9c0a into eclair
Merge commit '38325cb2d9c221691f37786a122e84043b5bcb90'

* commit '38325cb2d9c221691f37786a122e84043b5bcb90':
  Remove globalSearch argument from triggerSearch()
2009-10-01 13:59:48 -07:00
Mike Cleron
1396317f63 am e7937a9e: am f0e5ca7e: Merge change I55c9c7b7 into eclair
Merge commit 'e7937a9ec6d837b7f19810d0a05c58c10ebdff0d'

* commit 'e7937a9ec6d837b7f19810d0a05c58c10ebdff0d':
  New 1x status bar icons
2009-10-01 13:59:17 -07:00
Hung-ying Tyan
9a45b1fe01 am 3d95dfc4: am 62de7421: Merge change I4fe2a47a into eclair
Merge commit '3d95dfc4f6b03511c76580690cf7f7364f29c0a5'

* commit '3d95dfc4f6b03511c76580690cf7f7364f29c0a5':
  Fix stopping all vpn daemons before connect and more.
2009-10-01 13:58:52 -07:00
Romain Guy
2ebc3c348a am 43674307: am 9825ec61: Prevents the WindowManager from requesting empty or negative surfaces.
Merge commit '436743075aa3994365dc8c72a6be3ec90cb44d69'

* commit '436743075aa3994365dc8c72a6be3ec90cb44d69':
  Prevents the WindowManager from requesting empty or negative surfaces.
2009-10-01 13:58:08 -07:00
Mike Cleron
9204c7ca55 am 644a6bec: am ae5dd1d1: Merge change Ia1baa5ab into eclair
Merge commit '644a6bec1c95f761ce36fe34dc2cd7e704abd133'

* commit '644a6bec1c95f761ce36fe34dc2cd7e704abd133':
  More icons
2009-10-01 13:57:04 -07:00
Mike LeBeau
72162b590a am d3128570: am be000b53: Merge change I793b4f62 into eclair
Merge commit 'd31285708cf03c010b16c63f8380b8a6155e256b'

* commit 'd31285708cf03c010b16c63f8380b8a6155e256b':
  Clean up search and voice search button assets for high res.
2009-10-01 13:56:22 -07:00
Grace Kloba
baf04c082e am ad433430: am 00f60363: Merge change I2919f492 into eclair
Merge commit 'ad433430126bec9a1361dd857635aa494d3d6a10'

* commit 'ad433430126bec9a1361dd857635aa494d3d6a10':
  remove cert for SampleBrowserPlugin and only check
2009-10-01 13:55:11 -07:00
Dianne Hackborn
b13d0a311d am 41829e01: am e88846ee: Semi-workaround for #2027266: app drawer showing up on the side of the screen
Merge commit '41829e0138dbf3c3334eb3ca3bfcc08a26871f39'

* commit '41829e0138dbf3c3334eb3ca3bfcc08a26871f39':
  Semi-workaround for #2027266: app drawer showing up on the side of the screen
2009-10-01 13:54:45 -07:00
Dianne Hackborn
df197471cc am 943c8e7d: am 29e4a3c5: Update from API review.
Merge commit '943c8e7de682eb0d55167fe4c434e9f1c532a5ae'

* commit '943c8e7de682eb0d55167fe4c434e9f1c532a5ae':
  Update from API review.
2009-10-01 13:53:46 -07:00
Jim Miller
2a598aae27 am d42a7152: am d9b6f14a: Adjust opacity for inactive dimple in rotary widget
Merge commit 'd42a7152aa7b0673df6c8a13a8fc50e137aca70f'

* commit 'd42a7152aa7b0673df6c8a13a8fc50e137aca70f':
  Adjust opacity for inactive dimple in rotary widget
2009-10-01 13:53:27 -07:00
Evan Millar
6b81de4cd6 am cbbfd38f: am 9901e38a: Merge change I7a39c564 into eclair
Merge commit 'cbbfd38fc581a8b2d64faa898e5ac7fb924b3d95'

* commit 'cbbfd38fc581a8b2d64faa898e5ac7fb924b3d95':
  Fix docs error
2009-10-01 13:52:03 -07:00
Robert Greenwalt
0e626cfb7b am 14123084: am a1323c77: Merge change Iaf08eabc into eclair
Merge commit '1412308467116347e0443117b358c63da103774f'

* commit '1412308467116347e0443117b358c63da103774f':
  Reduce the ConnectivityManager logging.
2009-10-01 13:51:35 -07:00
Ray Chen
6a1262e210 am a6715ca6: am f09edd60: Merge change Id60fa26a into eclair
Merge commit 'a6715ca6f9e2125f2ea5db5cf71714e75618e9fa'

* commit 'a6715ca6f9e2125f2ea5db5cf71714e75618e9fa':
  Fix issue 2152541	thumbnail images stretched.
2009-10-01 13:51:07 -07:00
Mike Cleron
b7b071f991 am 29c72ef3: am 59a2c295: Merge change Id703d6bb into eclair
Merge commit '29c72ef336152f6b0bef6e99e0e76e07750fba3f'

* commit '29c72ef336152f6b0bef6e99e0e76e07750fba3f':
  Black is the new black
2009-10-01 13:50:38 -07:00
Evan Millar
8c341cc524 am 65114403: am 5042f7ea: Unhide ContactsContract#QuickContact and fix sdk build
Merge commit '65114403bf947b04804d846b9fd67e85a57b933b'

* commit '65114403bf947b04804d846b9fd67e85a57b933b':
  Unhide ContactsContract#QuickContact and fix sdk build
2009-10-01 13:50:18 -07:00
Robert Greenwalt
1d684b6e5e am 91a13318: am e6b27966: Merge change I94132420 into eclair
Merge commit '91a13318d4c44edcd10a1ed7021d1ef7ff8893b1'

* commit '91a13318d4c44edcd10a1ed7021d1ef7ff8893b1':
  Fix network-feature timeout code.
2009-10-01 13:49:20 -07:00
Grace Kloba
751b628bca am ff9af3f3: am 9d33d953: Merge change I07729abd into eclair
Merge commit 'ff9af3f3ee0300e9aee93435008cfb62d5bee600'

* commit 'ff9af3f3ee0300e9aee93435008cfb62d5bee600':
  Keep the scrollbar on during TOUCH_MOVE events even
2009-10-01 13:49:01 -07:00
Fred Quintana
4ed8d41308 am d5aa6028: am c868acf4: show events in the UI
Merge commit 'd5aa602861f154629960a285422819092b63ae7b'

* commit 'd5aa602861f154629960a285422819092b63ae7b':
  show events in the UI
2009-10-01 13:48:40 -07:00
Jaikumar Ganesh
0865a3adf9 am eff77e9a: am 8ad6d524: Merge change I55e15bad into eclair
Merge commit 'eff77e9a92c40d501f42b1774752b07d4e5141a7'

* commit 'eff77e9a92c40d501f42b1774752b07d4e5141a7':
  Try to reconnect twice when the rfcomm error code is Connection Refused.
2009-10-01 13:45:43 -07:00
Evan Millar
bc47f71e24 am eebbe04f: am 35de7ef8: Merge change I98f2db38 into eclair
Merge commit 'eebbe04fdca964afaa294bad1c3ed7a68dd1d938'

* commit 'eebbe04fdca964afaa294bad1c3ed7a68dd1d938':
  FastTrack->QuickContact
2009-10-01 13:45:20 -07:00
Robert Greenwalt
5d6fe3c404 am 4fc99930: am 7648bd1f: Merge change Ibb5626c5 into eclair
Merge commit '4fc99930a0329dbdc92aa5e0d82c7a406e5f6d6c'

* commit '4fc99930a0329dbdc92aa5e0d82c7a406e5f6d6c':
  Stop bringing the wifi interface up on reset.
2009-10-01 13:44:54 -07:00
Grace Kloba
7945d97f96 am 271fcd4a: am ade1aacf: Merge change Ic88b39e6 into eclair
Merge commit '271fcd4ac9f2149ad1c25ae0bab6393677d5a032'

* commit '271fcd4ac9f2149ad1c25ae0bab6393677d5a032':
  Add the signature checking for WebView plugins. The
2009-10-01 13:44:34 -07:00
Christopher Tate
55b0a4ea56 am 6a444d4f: am 5f3c928f: Merge change Id93f4c9e into eclair
Merge commit '6a444d4f5060a720d77daf8a81452566e327f266'

* commit '6a444d4f5060a720d77daf8a81452566e327f266':
  Turn off the last of the STOPSHIP verbose debugging
2009-10-01 13:44:14 -07:00
Wu-cheng Li
1abcddcb9a am 2b3489dd: am 5e5001bc: Merge change I7ed72bf5 into eclair
Merge commit '2b3489ddad289387a68955fbfaa37461b4d8a911'

* commit '2b3489ddad289387a68955fbfaa37461b4d8a911':
  Add documentation for scene mode. Other parameters may be changed after setting scene mode.
2009-10-01 13:43:54 -07:00
Eric Laurent
554d35ccbd am 46c5fdf6: am 3f56d21b: Merge change I89e74ba1 into eclair
Merge commit '46c5fdf60be5ba31ed7f31da42afdee639cddf15'

* commit '46c5fdf60be5ba31ed7f31da42afdee639cddf15':
  Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
2009-10-01 13:43:31 -07:00
Jason Sams
6387d99479 am 65318347: am 0ec1bc60: Merge change Ie9ad9a71 into eclair
Merge commit '65318347bbecb3fd0b8cd98a100b5be35d3c2dab'

* commit '65318347bbecb3fd0b8cd98a100b5be35d3c2dab':
  Implement screen aligned bitmap drawing support.
2009-10-01 13:43:12 -07:00
Eric Fischer
7b716f39d1 am 1dc38caf: am 88f2acb0: Merge change Iec1f8a2e into eclair
Merge commit '1dc38caf5fe5b479f50518b60e24c3c1df804dbf'

* commit '1dc38caf5fe5b479f50518b60e24c3c1df804dbf':
  Add Turkish accented letters for G and S on the hard keyboard.
2009-10-01 13:42:54 -07:00
Robert Greenwalt
dfbd540d72 am 66268213: am 15a5bffb: Merge change Ie944f08b into eclair
Merge commit '66268213471548c5fe8896fa72e6950606a5fb85'

* commit '66268213471548c5fe8896fa72e6950606a5fb85':
  Revert setDataEnabled to setting a master switch.
2009-10-01 13:42:35 -07:00