Commit Graph

6028 Commits

Author SHA1 Message Date
Marco Nelissen
77855f7a29 am 9b150b74: Close the cursor before assigning a new one to the same variable.
Merge commit '9b150b74573ce506abd00c692fb42f46980441a3' into eclair-plus-aosp

* commit '9b150b74573ce506abd00c692fb42f46980441a3':
  Close the cursor before assigning a new one to the same variable.
2009-10-01 08:36:00 -07:00
Daniel Sandler
29dd397239 am 87b94b13: Merge change I6e01fa52 into eclair
Merge commit '87b94b13ea8ad708d079ddfafe4801c12c38e57a' into eclair-plus-aosp

* commit '87b94b13ea8ad708d079ddfafe4801c12c38e57a':
  Remove unneeded icon.
2009-10-01 08:10:01 -07:00
Android (Google) Code Review
3431c6cba8 Merge change I6e01fa52 into eclair
* changes:
  Remove unneeded icon.
2009-10-01 11:01:34 -04:00
Michael Chan
ac9dabd315 am 5a463a69: Merge change Ic2a16d4f into eclair
Merge commit '5a463a693cae501f3e65936ea96e1ca1bae5fc3f' into eclair-plus-aosp

* commit '5a463a693cae501f3e65936ea96e1ca1bae5fc3f':
  b/2148252 Fix emulator
2009-10-01 08:00:16 -07:00
Android (Google) Code Review
00dcab7c05 Merge change Ic2a16d4f into eclair
* changes:
  b/2148252 Fix emulator
2009-10-01 10:52:01 -04:00
Mike Reed
ccc70b5842 am bbed0d68: hide setGammaForText, which is only used for calibrating new devices
Merge commit 'bbed0d68c815446400193bdc8b16fbf73e1ee664' into eclair-plus-aosp

* commit 'bbed0d68c815446400193bdc8b16fbf73e1ee664':
  hide setGammaForText, which is only used for calibrating new devices
2009-10-01 06:42:33 -07:00
Jeff Sharkey
855652f2c4 am c00099ef: Change intent flags for launching FastTrack.
Merge commit 'c00099ef62fc496429d0a06e580b600f61304f9c' into eclair-plus-aosp

* commit 'c00099ef62fc496429d0a06e580b600f61304f9c':
  Change intent flags for launching FastTrack.
2009-10-01 05:44:33 -07:00
Mathias Agopian
5db124cb8b am 271cfe85: Merge change Ia8826d67 into eclair
Merge commit '271cfe85ccfa6d94008dcebb3b97108ca325fe59' into eclair-plus-aosp

* commit '271cfe85ccfa6d94008dcebb3b97108ca325fe59':
  improve boot animation a bit
2009-10-01 03:22:36 -07:00
Android (Google) Code Review
3a6e128828 Merge change Ia8826d67 into eclair
* changes:
  improve boot animation a bit
2009-10-01 06:16:25 -04:00
Bjorn Bringert
6c8e8425a4 am a6309c30: On BACK in search, hide just IME if IME is fullscreen
Merge commit 'a6309c30722ad3aee88ddc2394cea2a499168d99' into eclair-plus-aosp

* commit 'a6309c30722ad3aee88ddc2394cea2a499168d99':
  On BACK in search, hide just IME if IME is fullscreen
2009-10-01 03:02:48 -07:00
Bjorn Bringert
10c7cfdb14 am 95c98dd5: Merge change Ie69a9c0a into eclair
Merge commit '95c98dd5fd5920933231c424ff53f91adeee9503' into eclair-plus-aosp

* commit '95c98dd5fd5920933231c424ff53f91adeee9503':
  Remove globalSearch argument from triggerSearch()
2009-10-01 02:20:02 -07:00
Android (Google) Code Review
64005a6ff0 Merge change Ie69a9c0a into eclair
* changes:
  Remove globalSearch argument from triggerSearch()
2009-10-01 05:10:15 -04:00
Mike Cleron
6d3250878d am f0e5ca7e: Merge change I55c9c7b7 into eclair
Merge commit 'f0e5ca7e09a8651b85c652e040a037e39e224128' into eclair-plus-aosp

* commit 'f0e5ca7e09a8651b85c652e040a037e39e224128':
  New 1x status bar icons
2009-10-01 01:54:51 -07:00
Android (Google) Code Review
0026f57ccc Merge change I55c9c7b7 into eclair
* changes:
  New 1x status bar icons
2009-10-01 04:48:32 -04:00
Hung-ying Tyan
879d983835 am 62de7421: Merge change I4fe2a47a into eclair
Merge commit '62de742125d8f5fd1d236f720b2de3bf5cf76174' into eclair-plus-aosp

* commit '62de742125d8f5fd1d236f720b2de3bf5cf76174':
  Fix stopping all vpn daemons before connect and more.
2009-10-01 01:47:05 -07:00
Android (Google) Code Review
dea7c01361 Merge change I4fe2a47a into eclair
* changes:
  Fix stopping all vpn daemons before connect and more.
2009-10-01 04:39:38 -04:00
Romain Guy
f75c3cf6cc am 9825ec61: Prevents the WindowManager from requesting empty or negative surfaces.
Merge commit '9825ec61b4a40ed92a5bb28019289e5bab9cfb56' into eclair-plus-aosp

* commit '9825ec61b4a40ed92a5bb28019289e5bab9cfb56':
  Prevents the WindowManager from requesting empty or negative surfaces.
2009-10-01 01:25:45 -07:00
Mike Cleron
8219957103 am ae5dd1d1: Merge change Ia1baa5ab into eclair
Merge commit 'ae5dd1d19a6b7f9453daf03deb1907eb039d1ef6' into eclair-plus-aosp

* commit 'ae5dd1d19a6b7f9453daf03deb1907eb039d1ef6':
  More icons
2009-10-01 00:43:39 -07:00
Mike LeBeau
c2bb07b1e6 am be000b53: Merge change I793b4f62 into eclair
Merge commit 'be000b53be9ee73b14c7f172c9784c366dbb91c8' into eclair-plus-aosp

* commit 'be000b53be9ee73b14c7f172c9784c366dbb91c8':
  Clean up search and voice search button assets for high res.
2009-10-01 00:36:24 -07:00
Android (Google) Code Review
f7f1268c60 Merge change Ia1baa5ab into eclair
* changes:
  More icons
2009-10-01 03:35:27 -04:00
Android (Google) Code Review
2326df2d5b Merge change I793b4f62 into eclair
* changes:
  Clean up search and voice search button assets for high res.
2009-10-01 03:30:34 -04:00
Grace Kloba
4223c553f4 am 00f60363: Merge change I2919f492 into eclair
Merge commit '00f603635d4cec4403687d8ee97aced91fb32108' into eclair-plus-aosp

* commit '00f603635d4cec4403687d8ee97aced91fb32108':
  remove cert for SampleBrowserPlugin and only check
2009-09-30 23:42:46 -07:00
Dianne Hackborn
f67246108f am e88846ee: Semi-workaround for #2027266: app drawer showing up on the side of the screen
Merge commit 'e88846eeaf70f9f4299af9e3d54ba5dacede42b6' into eclair-plus-aosp

* commit 'e88846eeaf70f9f4299af9e3d54ba5dacede42b6':
  Semi-workaround for #2027266: app drawer showing up on the side of the screen
2009-09-30 23:42:37 -07:00
Android (Google) Code Review
4dd752c9cc Merge change I2919f492 into eclair
* changes:
  remove cert for SampleBrowserPlugin and only check signature for the release build.
2009-10-01 02:37:18 -04:00
Dianne Hackborn
7309c85bf9 am 29e4a3c5: Update from API review.
Merge commit '29e4a3c566f435c32f0b95e4ac8e8b33cac6faba' into eclair-plus-aosp

* commit '29e4a3c566f435c32f0b95e4ac8e8b33cac6faba':
  Update from API review.
2009-09-30 23:27:41 -07:00
Jim Miller
3d6f8c594d am d9b6f14a: Adjust opacity for inactive dimple in rotary widget
Merge commit 'd9b6f14a6926dce7ad3d98e6e30b503c69c904c0' into eclair-plus-aosp

* commit 'd9b6f14a6926dce7ad3d98e6e30b503c69c904c0':
  Adjust opacity for inactive dimple in rotary widget
2009-09-30 23:22:57 -07:00
Evan Millar
f7cad70e98 am 9901e38a: Merge change I7a39c564 into eclair
Merge commit '9901e38a962012d56accbc9b6259f9997bcd9c31' into eclair-plus-aosp

* commit '9901e38a962012d56accbc9b6259f9997bcd9c31':
  Fix docs error
2009-09-30 22:33:29 -07:00
Android (Google) Code Review
3b2a59bc95 Merge change I7a39c564 into eclair
* changes:
  Fix docs error
2009-10-01 01:27:16 -04:00
Robert Greenwalt
5cf3fbbccb am a1323c77: Merge change Iaf08eabc into eclair
Merge commit 'a1323c77b961ae1b9cfaf5305e05780b07e88226' into eclair-plus-aosp

* commit 'a1323c77b961ae1b9cfaf5305e05780b07e88226':
  Reduce the ConnectivityManager logging.
2009-09-30 22:18:54 -07:00
Ray Chen
e2629e19f7 am f09edd60: Merge change Id60fa26a into eclair
Merge commit 'f09edd60376f6ad755ebaaf0c1f89f561f78468c' into eclair-plus-aosp

* commit 'f09edd60376f6ad755ebaaf0c1f89f561f78468c':
  Fix issue 2152541	thumbnail images stretched.
2009-09-30 22:18:41 -07:00
Android (Google) Code Review
bd9daeecec Merge change Iaf08eabc into eclair
* changes:
  Reduce the ConnectivityManager logging.
2009-10-01 01:14:38 -04:00
Mike Cleron
4dd0f16277 am 59a2c295: Merge change Id703d6bb into eclair
Merge commit '59a2c2958d0bcc00402ebb961b02368004117e3b' into eclair-plus-aosp

* commit '59a2c2958d0bcc00402ebb961b02368004117e3b':
  Black is the new black
2009-09-30 22:13:38 -07:00
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
Android (Google) Code Review
8642995452 Merge change Id60fa26a into eclair
* changes:
  Fix issue 2152541	thumbnail images stretched.
2009-10-01 01:12:35 -04:00
Android (Google) Code Review
c3ea63af0e Merge change Id703d6bb into eclair
* changes:
  Black is the new black
2009-10-01 01:06:16 -04: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