OSDN Git Service
Daisuke Miyakawa [Mon, 5 Oct 2009 21:03:01 +0000 (14:03 -0700)]
am
07086eb9: Merge change Ifb63d236 into eclair-mr2
Merge commit '
07086eb9dd351f716843ddc4ff7afbd15d25d49c' into eclair-mr2-plus-aosp
* commit '
07086eb9dd351f716843ddc4ff7afbd15d25d49c':
Add cancel() VCardDataBuilder, which is intended to remove
Android (Google) Code Review [Mon, 5 Oct 2009 20:56:37 +0000 (16:56 -0400)]
Merge change Ifb63d236 into eclair-mr2
* changes:
Add cancel() VCardDataBuilder, which is intended to remove a false alerm "Nested VCard code is not supported now." when importing vCard 3.0 file.
Bjorn Bringert [Mon, 5 Oct 2009 20:25:54 +0000 (13:25 -0700)]
am
3448b676: am
9e4c8561: Merge change I8d48149c into eclair
Merge commit '
3448b676e9e7562a9b2de54951ac19eae43a6864' into eclair-mr2-plus-aosp
* commit '
3448b676e9e7562a9b2de54951ac19eae43a6864':
Don't reinflate search bar when dialog is already showing
Bjorn Bringert [Mon, 5 Oct 2009 20:20:31 +0000 (13:20 -0700)]
am
9e4c8561: Merge change I8d48149c into eclair
Merge commit '
9e4c85614c861f095131ffa76e65cbba55d03d0a' into eclair-mr2
* commit '
9e4c85614c861f095131ffa76e65cbba55d03d0a':
Don't reinflate search bar when dialog is already showing
Android (Google) Code Review [Mon, 5 Oct 2009 20:15:14 +0000 (16:15 -0400)]
Merge change I8d48149c into eclair
* changes:
Don't reinflate search bar when dialog is already showing
Dianne Hackborn [Mon, 5 Oct 2009 20:03:39 +0000 (13:03 -0700)]
am
a4a8a88b: am
9830a4ac: Fix issue #
2161169: onStop not being called.
Merge commit '
a4a8a88bf7aeec3413eda09c8a61c1df01c474ac' into eclair-mr2-plus-aosp
* commit '
a4a8a88bf7aeec3413eda09c8a61c1df01c474ac':
Fix issue #
2161169: onStop not being called.
Grace Kloba [Mon, 5 Oct 2009 20:03:34 +0000 (13:03 -0700)]
am
7fd7534b: Merge change I5101c2b1 into eclair-mr2
Merge commit '
7fd7534b58b523851e932f8b1bde61532b738e8a' into eclair-mr2-plus-aosp
* commit '
7fd7534b58b523851e932f8b1bde61532b738e8a':
Extend the date time to handle the case where the
Dianne Hackborn [Mon, 5 Oct 2009 19:58:24 +0000 (12:58 -0700)]
am
9830a4ac: Fix issue #
2161169: onStop not being called.
Merge commit '
9830a4ac42c9e16db91d1de6120cc2eb613fc946' into eclair-mr2
* commit '
9830a4ac42c9e16db91d1de6120cc2eb613fc946':
Fix issue #
2161169: onStop not being called.
Android (Google) Code Review [Mon, 5 Oct 2009 18:49:38 +0000 (14:49 -0400)]
Merge change I5101c2b1 into eclair-mr2
* changes:
Extend the date time to handle the case where the month is in the full name.
Fred Quintana [Mon, 5 Oct 2009 18:46:07 +0000 (11:46 -0700)]
am
bf13850b: am
f7ae77cd: account manager api review changes
Merge commit '
bf13850bed17d994077d1e6226b6330dd960bf26' into eclair-mr2-plus-aosp
* commit '
bf13850bed17d994077d1e6226b6330dd960bf26':
account manager api review changes
Fred Quintana [Mon, 5 Oct 2009 18:34:43 +0000 (11:34 -0700)]
am
f7ae77cd: account manager api review changes
Merge commit '
f7ae77cd67f1a3993b8e56c1af4720a7adf4e69d' into eclair-mr2
* commit '
f7ae77cd67f1a3993b8e56c1af4720a7adf4e69d':
account manager api review changes
Leon Clarke [Mon, 5 Oct 2009 17:13:53 +0000 (10:13 -0700)]
am
adff6542: Make the text bit transparent to allow the correct color to show through
Merge commit '
adff654271246c700006e7f8079795d70319f032' into eclair-mr2-plus-aosp
* commit '
adff654271246c700006e7f8079795d70319f032':
Make the text bit transparent to allow the correct color to show through
Patrick Scott [Mon, 5 Oct 2009 17:13:51 +0000 (10:13 -0700)]
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Dianne Hackborn [Sun, 4 Oct 2009 22:41:35 +0000 (15:41 -0700)]
am
48e6725c: Merge change Iaca22686 into eclair
Merge commit '
48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-mr2
* commit '
48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
Work on issue #
2163789: Way too much logging
Android (Google) Code Review [Sun, 4 Oct 2009 22:35:24 +0000 (18:35 -0400)]
Merge change Iaca22686 into eclair
* changes:
Work on issue #
2163789: Way too much logging
Dianne Hackborn [Sun, 4 Oct 2009 22:27:09 +0000 (15:27 -0700)]
am
cbc52b7b: Merge change Iee638412 into eclair
Merge commit '
cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910' into eclair-mr2
* commit '
cbc52b7bcbea7dc6ae3b7cfc84fd44ae86711910':
Fix issue #
2161726: Car dock app bypasses setup wizard
Scott Main [Sun, 4 Oct 2009 22:27:00 +0000 (15:27 -0700)]
am
87d5004d: am
e9e1cdd5: decode the search string before putting it into the search control. this fixes a safari-only bug in which encoded chars were inserted into the search string.
Merge commit '
87d5004d3b62441a55b2aba870e4276af6c771eb' into eclair-mr2
* commit '
87d5004d3b62441a55b2aba870e4276af6c771eb':
decode the search string before putting it into the search control.
Mike Lockwood [Sun, 4 Oct 2009 22:22:08 +0000 (15:22 -0700)]
am
2ecf3f5e: dumpstate: Add backlight information to bugreport output.
Merge commit '
2ecf3f5e00ea2ac630ffb405baba33113596cf38' into eclair-mr2
* commit '
2ecf3f5e00ea2ac630ffb405baba33113596cf38':
dumpstate: Add backlight information to bugreport output.
Mathias Agopian [Sun, 4 Oct 2009 22:21:34 +0000 (15:21 -0700)]
am
f8e4bc9f: Merge change I0c4cec7e into eclair
Merge commit '
f8e4bc9f7789b98b54fe04df56555ca8c630df70' into eclair-mr2
* commit '
f8e4bc9f7789b98b54fe04df56555ca8c630df70':
Attempt to fix [
2152536] ANR in browser
Jason Sams [Sun, 4 Oct 2009 22:21:04 +0000 (15:21 -0700)]
am
8df16d63: Merge change I7f047786 into eclair
Merge commit '
8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc' into eclair-mr2
* commit '
8df16d63d4e1c70cf75a9acc4f24e4e1abca5abc':
Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion.
Dmitri Plotnikov [Sun, 4 Oct 2009 22:20:26 +0000 (15:20 -0700)]
am
82e863d8: Merge change Ic0d82ef1 into eclair
Merge commit '
82e863d8ab5166fec3dce96ae865d1e2d3bbc021' into eclair-mr2
* commit '
82e863d8ab5166fec3dce96ae865d1e2d3bbc021':
[Issue
2161366] Changing capitalization of string "Via" to "via"
Android (Google) Code Review [Sun, 4 Oct 2009 22:19:29 +0000 (18:19 -0400)]
Merge change Iee638412 into eclair
* changes:
Fix issue #
2161726: Car dock app bypasses setup wizard
San Mehat [Sun, 4 Oct 2009 22:19:27 +0000 (15:19 -0700)]
am
7b16834a: Merge change Iaf686344 into eclair
Merge commit '
7b16834adc1003f492cd2be4b1bcc3fb73a78c23' into eclair-mr2
* commit '
7b16834adc1003f492cd2be4b1bcc3fb73a78c23':
dumpstate: Display mtime instead of ctime
Wei Huang [Sun, 4 Oct 2009 22:19:08 +0000 (15:19 -0700)]
am
6b370745: bug
2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Merge commit '
6b3707452c5921c89258371eec140b0fb76766f8' into eclair-mr2
* commit '
6b3707452c5921c89258371eec140b0fb76766f8':
bug
2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Mike Cleron [Sun, 4 Oct 2009 22:17:27 +0000 (15:17 -0700)]
am
df64cb41: Merge change I80ce8833 into eclair
Merge commit '
df64cb41fb44d56957cba8e375788d98af7bd8b4' into eclair-mr2
* commit '
df64cb41fb44d56957cba8e375788d98af7bd8b4':
Icons again
David Brown [Sun, 4 Oct 2009 22:17:18 +0000 (15:17 -0700)]
am
88e03757: RotarySelector widget: add callback for "grabbed" state changes.
Merge commit '
88e037577f7db140e4ef88b77eefaa910e06e5f5' into eclair-mr2
* commit '
88e037577f7db140e4ef88b77eefaa910e06e5f5':
RotarySelector widget: add callback for "grabbed" state changes.
Eric Fischer [Sun, 4 Oct 2009 22:16:07 +0000 (15:16 -0700)]
am
3d7bb3a5: (-s ours) Merge change I3ca8fb69 into eclair
Merge commit '
3d7bb3a5e49b559725bba84390b1021d9c527347' into eclair-mr2
* commit '
3d7bb3a5e49b559725bba84390b1021d9c527347':
Import revised translations. DO NOT MERGE
Jaikumar Ganesh [Sun, 4 Oct 2009 22:14:55 +0000 (15:14 -0700)]
am
d453fe67: Merge change I5dbd1994 into eclair
Merge commit '
d453fe6709c4d28350e34fa39b4fe73d98a36a0c' into eclair-mr2
* commit '
d453fe6709c4d28350e34fa39b4fe73d98a36a0c':
Fix rfcomm socket connect return code.
Mathias Agopian [Sun, 4 Oct 2009 22:14:32 +0000 (15:14 -0700)]
am
4ac45597: Merge change I15b0ebb9 into eclair
Merge commit '
4ac45597fb70ca4f268cb1920fcb2de61aff4a3d' into eclair-mr2
* commit '
4ac45597fb70ca4f268cb1920fcb2de61aff4a3d':
a simple test app for gralloc
Joe Onorato [Sun, 4 Oct 2009 22:14:08 +0000 (15:14 -0700)]
am
d14cfc27: Merge change I9e384ddd into eclair
Merge commit '
d14cfc27627107c2973eeacc3bcbb2830a3fd620' into eclair-mr2
* commit '
d14cfc27627107c2973eeacc3bcbb2830a3fd620':
Add a test pattern as rollo's icon
John Wang [Sun, 4 Oct 2009 22:13:58 +0000 (15:13 -0700)]
am
99510681: Unhide constant DATA_ACTIVITY_DORMANT.
Merge commit '
99510681e9f1c76f82719e724990f744cfdbcefd' into eclair-mr2
* commit '
99510681e9f1c76f82719e724990f744cfdbcefd':
Unhide constant DATA_ACTIVITY_DORMANT.
Scott Main [Sun, 4 Oct 2009 22:05:43 +0000 (15:05 -0700)]
am
e9e1cdd5: decode the search string before putting it into the search control. this fixes a safari-only bug in which encoded chars were inserted into the search string.
Merge commit '
e9e1cdd556b40a04637b7de3d839b2a596df47e3' into eclair
* commit '
e9e1cdd556b40a04637b7de3d839b2a596df47e3':
decode the search string before putting it into the search control.
Android (Google) Code Review [Sat, 3 Oct 2009 03:35:12 +0000 (23:35 -0400)]
Merge change I0c4cec7e into eclair
* changes:
Attempt to fix [
2152536] ANR in browser
Android (Google) Code Review [Sat, 3 Oct 2009 01:40:07 +0000 (21:40 -0400)]
Merge change I7f047786 into eclair
* changes:
Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion.
Mathias Agopian [Sat, 3 Oct 2009 01:12:30 +0000 (18:12 -0700)]
Attempt to fix [
2152536] ANR in browser
The ANR is caused by SurfaceFlinger waiting for buffers of a removed surface to become availlable.
When it is removed from the current list, a Surface is marked as NO_INIT, which causes SF to return
immediately in the above case. For some reason, the surface here wasn't marked as NO_INIT.
This change makes the code more robust by always (irregadless or errors) setting the NO_INIT status
in all code paths where a surface is removed from the list.
Additionaly added more information in the logs, should this happen again.
Android (Google) Code Review [Fri, 2 Oct 2009 23:17:30 +0000 (19:17 -0400)]
Merge change Ic0d82ef1 into eclair
* changes:
[Issue
2161366] Changing capitalization of string "Via" to "via"
Android (Google) Code Review [Fri, 2 Oct 2009 21:49:59 +0000 (17:49 -0400)]
Merge change Ib4285d22 into eclair-mr2
* changes:
Change way we choose EGL surfaces to be compatible with the native window surface.
Jack Palevich [Fri, 2 Oct 2009 21:43:51 +0000 (14:43 -0700)]
Change way we choose EGL surfaces to be compatible with the native
window surface.
Android (Google) Code Review [Fri, 2 Oct 2009 20:35:51 +0000 (16:35 -0400)]
Merge change Ic66f68a7 into eclair-mr2
* changes:
Fix a null pointer exception caught by the monkey.
Android (Google) Code Review [Fri, 2 Oct 2009 20:34:02 +0000 (16:34 -0400)]
Merge change Iaf686344 into eclair
* changes:
dumpstate: Display mtime instead of ctime
Android (Google) Code Review [Fri, 2 Oct 2009 20:28:11 +0000 (16:28 -0400)]
Merge change I499a9541 into eclair-mr2
* changes:
setupRedirect() can throw. Catch it and signal the error.
Android (Google) Code Review [Fri, 2 Oct 2009 07:51:19 +0000 (03:51 -0400)]
Merge change I80ce8833 into eclair
* changes:
Icons again
Android (Google) Code Review [Fri, 2 Oct 2009 04:47:08 +0000 (00:47 -0400)]
Merge change I3ca8fb69 into eclair
* changes:
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Fri, 2 Oct 2009 02:46:23 +0000 (22:46 -0400)]
Merge change I5dbd1994 into eclair
* changes:
Fix rfcomm socket connect return code.
Android (Google) Code Review [Fri, 2 Oct 2009 00:25:45 +0000 (20:25 -0400)]
Merge change I15b0ebb9 into eclair
* changes:
a simple test app for gralloc
Mathias Agopian [Thu, 1 Oct 2009 22:45:37 +0000 (15:45 -0700)]
a simple test app for gralloc
Android (Google) Code Review [Thu, 1 Oct 2009 23:49:27 +0000 (19:49 -0400)]
Merge change I9e384ddd into eclair
* changes:
Add a test pattern as rollo's icon
android-build SharedAccount [Thu, 1 Oct 2009 15:43:40 +0000 (08:43 -0700)]
Merge commit 'goog/eclair' into eclair-release
Marco Nelissen [Thu, 1 Oct 2009 15:36:00 +0000 (08:36 -0700)]
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.
Daniel Sandler [Thu, 1 Oct 2009 15:10:01 +0000 (08:10 -0700)]
am
87b94b13: Merge change I6e01fa52 into eclair
Merge commit '
87b94b13ea8ad708d079ddfafe4801c12c38e57a' into eclair-plus-aosp
* commit '
87b94b13ea8ad708d079ddfafe4801c12c38e57a':
Remove unneeded icon.
Android (Google) Code Review [Thu, 1 Oct 2009 15:01:34 +0000 (11:01 -0400)]
Merge change I6e01fa52 into eclair
* changes:
Remove unneeded icon.
Michael Chan [Thu, 1 Oct 2009 15:00:16 +0000 (08:00 -0700)]
am
5a463a69: Merge change Ic2a16d4f into eclair
Merge commit '
5a463a693cae501f3e65936ea96e1ca1bae5fc3f' into eclair-plus-aosp
* commit '
5a463a693cae501f3e65936ea96e1ca1bae5fc3f':
b/
2148252 Fix emulator
Android (Google) Code Review [Thu, 1 Oct 2009 14:52:01 +0000 (10:52 -0400)]
Merge change Ic2a16d4f into eclair
* changes:
b/
2148252 Fix emulator
Mike Reed [Thu, 1 Oct 2009 13:42:33 +0000 (06:42 -0700)]
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
Jeff Sharkey [Thu, 1 Oct 2009 12:44:33 +0000 (05:44 -0700)]
am
c00099ef: Change intent flags for launching FastTrack.
Merge commit '
c00099ef62fc496429d0a06e580b600f61304f9c' into eclair-plus-aosp
* commit '
c00099ef62fc496429d0a06e580b600f61304f9c':
Change intent flags for launching FastTrack.
Mathias Agopian [Thu, 1 Oct 2009 10:22:36 +0000 (03:22 -0700)]
am
271cfe85: Merge change Ia8826d67 into eclair
Merge commit '
271cfe85ccfa6d94008dcebb3b97108ca325fe59' into eclair-plus-aosp
* commit '
271cfe85ccfa6d94008dcebb3b97108ca325fe59':
improve boot animation a bit
Android (Google) Code Review [Thu, 1 Oct 2009 10:16:25 +0000 (06:16 -0400)]
Merge change Ia8826d67 into eclair
* changes:
improve boot animation a bit
Bjorn Bringert [Thu, 1 Oct 2009 10:02:48 +0000 (03:02 -0700)]
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
Bjorn Bringert [Thu, 1 Oct 2009 09:20:02 +0000 (02:20 -0700)]
am
95c98dd5: Merge change Ie69a9c0a into eclair
Merge commit '
95c98dd5fd5920933231c424ff53f91adeee9503' into eclair-plus-aosp
* commit '
95c98dd5fd5920933231c424ff53f91adeee9503':
Remove globalSearch argument from triggerSearch()
Android (Google) Code Review [Thu, 1 Oct 2009 09:10:15 +0000 (05:10 -0400)]
Merge change Ie69a9c0a into eclair
* changes:
Remove globalSearch argument from triggerSearch()
Mike Cleron [Thu, 1 Oct 2009 08:54:51 +0000 (01:54 -0700)]
am
f0e5ca7e: Merge change I55c9c7b7 into eclair
Merge commit '
f0e5ca7e09a8651b85c652e040a037e39e224128' into eclair-plus-aosp
* commit '
f0e5ca7e09a8651b85c652e040a037e39e224128':
New 1x status bar icons
Android (Google) Code Review [Thu, 1 Oct 2009 08:48:32 +0000 (04:48 -0400)]
Merge change I55c9c7b7 into eclair
* changes:
New 1x status bar icons
Hung-ying Tyan [Thu, 1 Oct 2009 08:47:05 +0000 (01:47 -0700)]
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.
Android (Google) Code Review [Thu, 1 Oct 2009 08:39:38 +0000 (04:39 -0400)]
Merge change I4fe2a47a into eclair
* changes:
Fix stopping all vpn daemons before connect and more.
Romain Guy [Thu, 1 Oct 2009 08:25:45 +0000 (01:25 -0700)]
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.
Mike Cleron [Thu, 1 Oct 2009 07:43:39 +0000 (00:43 -0700)]
am
ae5dd1d1: Merge change Ia1baa5ab into eclair
Merge commit '
ae5dd1d19a6b7f9453daf03deb1907eb039d1ef6' into eclair-plus-aosp
* commit '
ae5dd1d19a6b7f9453daf03deb1907eb039d1ef6':
More icons
Mike LeBeau [Thu, 1 Oct 2009 07:36:24 +0000 (00:36 -0700)]
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.
Android (Google) Code Review [Thu, 1 Oct 2009 07:35:27 +0000 (03:35 -0400)]
Merge change Ia1baa5ab into eclair
* changes:
More icons
Android (Google) Code Review [Thu, 1 Oct 2009 07:30:34 +0000 (03:30 -0400)]
Merge change I793b4f62 into eclair
* changes:
Clean up search and voice search button assets for high res.
Grace Kloba [Thu, 1 Oct 2009 06:42:46 +0000 (23:42 -0700)]
am
00f60363: Merge change I2919f492 into eclair
Merge commit '
00f603635d4cec4403687d8ee97aced91fb32108' into eclair-plus-aosp
* commit '
00f603635d4cec4403687d8ee97aced91fb32108':
remove cert for SampleBrowserPlugin and only check
Dianne Hackborn [Thu, 1 Oct 2009 06:42:37 +0000 (23:42 -0700)]
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
Android (Google) Code Review [Thu, 1 Oct 2009 06:37:18 +0000 (02:37 -0400)]
Merge change I2919f492 into eclair
* changes:
remove cert for SampleBrowserPlugin and only check signature for the release build.
Dianne Hackborn [Thu, 1 Oct 2009 06:27:41 +0000 (23:27 -0700)]
am
29e4a3c5: Update from API review.
Merge commit '
29e4a3c566f435c32f0b95e4ac8e8b33cac6faba' into eclair-plus-aosp
* commit '
29e4a3c566f435c32f0b95e4ac8e8b33cac6faba':
Update from API review.
Jim Miller [Thu, 1 Oct 2009 06:22:57 +0000 (23:22 -0700)]
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
Evan Millar [Thu, 1 Oct 2009 05:33:29 +0000 (22:33 -0700)]
am
9901e38a: Merge change I7a39c564 into eclair
Merge commit '
9901e38a962012d56accbc9b6259f9997bcd9c31' into eclair-plus-aosp
* commit '
9901e38a962012d56accbc9b6259f9997bcd9c31':
Fix docs error
Android (Google) Code Review [Thu, 1 Oct 2009 05:27:16 +0000 (01:27 -0400)]
Merge change I7a39c564 into eclair
* changes:
Fix docs error
Robert Greenwalt [Thu, 1 Oct 2009 05:18:54 +0000 (22:18 -0700)]
am
a1323c77: Merge change Iaf08eabc into eclair
Merge commit '
a1323c77b961ae1b9cfaf5305e05780b07e88226' into eclair-plus-aosp
* commit '
a1323c77b961ae1b9cfaf5305e05780b07e88226':
Reduce the ConnectivityManager logging.
Ray Chen [Thu, 1 Oct 2009 05:18:41 +0000 (22:18 -0700)]
am
f09edd60: Merge change Id60fa26a into eclair
Merge commit '
f09edd60376f6ad755ebaaf0c1f89f561f78468c' into eclair-plus-aosp
* commit '
f09edd60376f6ad755ebaaf0c1f89f561f78468c':
Fix issue
2152541 thumbnail images stretched.
Android (Google) Code Review [Thu, 1 Oct 2009 05:14:38 +0000 (01:14 -0400)]
Merge change Iaf08eabc into eclair
* changes:
Reduce the ConnectivityManager logging.
Mike Cleron [Thu, 1 Oct 2009 05:13:38 +0000 (22:13 -0700)]
am
59a2c295: Merge change Id703d6bb into eclair
Merge commit '
59a2c2958d0bcc00402ebb961b02368004117e3b' into eclair-plus-aosp
* commit '
59a2c2958d0bcc00402ebb961b02368004117e3b':
Black is the new black
Evan Millar [Thu, 1 Oct 2009 05:13:29 +0000 (22:13 -0700)]
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
Android (Google) Code Review [Thu, 1 Oct 2009 05:12:35 +0000 (01:12 -0400)]
Merge change Id60fa26a into eclair
* changes:
Fix issue
2152541 thumbnail images stretched.
Android (Google) Code Review [Thu, 1 Oct 2009 05:06:16 +0000 (01:06 -0400)]
Merge change Id703d6bb into eclair
* changes:
Black is the new black
Robert Greenwalt [Thu, 1 Oct 2009 04:48:10 +0000 (21:48 -0700)]
am
e6b27966: Merge change I94132420 into eclair
Merge commit '
e6b27966fd7e181a52b35cd95937b935ba05783b' into eclair-plus-aosp
* commit '
e6b27966fd7e181a52b35cd95937b935ba05783b':
Fix network-feature timeout code.
Grace Kloba [Thu, 1 Oct 2009 04:48:02 +0000 (21:48 -0700)]
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
Android (Google) Code Review [Thu, 1 Oct 2009 04:43:51 +0000 (00:43 -0400)]
Merge change I94132420 into eclair
* changes:
Fix network-feature timeout code.
Android (Google) Code Review [Thu, 1 Oct 2009 04:41:21 +0000 (00:41 -0400)]
Merge change I07729abd into eclair
* changes:
Keep the scrollbar on during TOUCH_MOVE events even when there is no movement.
Fred Quintana [Thu, 1 Oct 2009 04:38:23 +0000 (21:38 -0700)]
am
c868acf4: show events in the UI
Merge commit '
c868acf442a69429056a574c67a5e0187e2b9536' into eclair-plus-aosp
* commit '
c868acf442a69429056a574c67a5e0187e2b9536':
show events in the UI
Jaikumar Ganesh [Thu, 1 Oct 2009 04:19:46 +0000 (21:19 -0700)]
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.
Evan Millar [Thu, 1 Oct 2009 04:19:38 +0000 (21:19 -0700)]
am
35de7ef8: Merge change I98f2db38 into eclair
Merge commit '
35de7ef84380975a229d5b984b63da23871738db' into eclair-plus-aosp
* commit '
35de7ef84380975a229d5b984b63da23871738db':
FastTrack->QuickContact
Robert Greenwalt [Thu, 1 Oct 2009 04:18:57 +0000 (21:18 -0700)]
am
7648bd1f: Merge change Ibb5626c5 into eclair
Merge commit '
7648bd1f0005b869e87708b62442a8ad9884266a' into eclair-plus-aosp
* commit '
7648bd1f0005b869e87708b62442a8ad9884266a':
Stop bringing the wifi interface up on reset.
Grace Kloba [Thu, 1 Oct 2009 04:17:58 +0000 (21:17 -0700)]
am
ade1aacf: Merge change Ic88b39e6 into eclair
Merge commit '
ade1aacf4cb9a43b85f0c70b145b42127c54f065' into eclair-plus-aosp
* commit '
ade1aacf4cb9a43b85f0c70b145b42127c54f065':
Add the signature checking for WebView plugins. The
Christopher Tate [Thu, 1 Oct 2009 04:17:46 +0000 (21:17 -0700)]
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
Wu-cheng Li [Thu, 1 Oct 2009 04:17:01 +0000 (21:17 -0700)]
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.
Eric Laurent [Thu, 1 Oct 2009 04:16:47 +0000 (21:16 -0700)]
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.
Jason Sams [Thu, 1 Oct 2009 04:16:31 +0000 (21:16 -0700)]
am
0ec1bc60: Merge change Ie9ad9a71 into eclair
Merge commit '
0ec1bc606ff9b1d7b2a7bbbaba39f971a794a9c0' into eclair-plus-aosp
* commit '
0ec1bc606ff9b1d7b2a7bbbaba39f971a794a9c0':
Implement screen aligned bitmap drawing support.
Eric Fischer [Thu, 1 Oct 2009 04:15:06 +0000 (21:15 -0700)]
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.
Robert Greenwalt [Thu, 1 Oct 2009 04:14:49 +0000 (21:14 -0700)]
am
15a5bffb: Merge change Ie944f08b into eclair
Merge commit '
15a5bffb7efc59895a92e6072717e001d2d9480c' into eclair-plus-aosp
* commit '
15a5bffb7efc59895a92e6072717e001d2d9480c':
Revert setDataEnabled to setting a master switch.
Jaikumar Ganesh [Thu, 1 Oct 2009 04:14:41 +0000 (21:14 -0700)]
am
4c9a29ef: Set Sink State when ACL disconnects.
Merge commit '
4c9a29efdbf58034c1d90eb001dc7299f1f012ea' into eclair-plus-aosp
* commit '
4c9a29efdbf58034c1d90eb001dc7299f1f012ea':
Set Sink State when ACL disconnects.
Evan Millar [Thu, 1 Oct 2009 04:13:59 +0000 (21:13 -0700)]
am
5eb7c9d3: Merge change Ifc9162c5 into eclair
Merge commit '
5eb7c9d3e880032972c0d03dd34d9432fa7c719d' into eclair-plus-aosp
* commit '
5eb7c9d3e880032972c0d03dd34d9432fa7c719d':
Fix padding around QuickContactBadge in ContactHeaderWidget
OSDN Git Service
