OSDN Git Service
Grace Kloba [Thu, 21 Jan 2010 03:20:57 +0000 (19:20 -0800)]
Grace Kloba [Thu, 21 Jan 2010 01:38:18 +0000 (17:38 -0800)]
DO NOT MERGE
Adopt the sloppy detection in the ScaleGestureDetector.
Try to fix the fat thumb problem.
Fix http://b/issue?id=
2385061
Mike Reed [Thu, 21 Jan 2010 02:35:24 +0000 (18:35 -0800)]
am
a66baccc: Merge "Do not merge" into eclair
Merge commit '
a66baccc8fa9f6fa5f1630845e3c6370cb3418eb' into eclair-plus-aosp
* commit '
a66baccc8fa9f6fa5f1630845e3c6370cb3418eb':
Do not merge
Mike Reed [Thu, 21 Jan 2010 02:32:32 +0000 (18:32 -0800)]
Merge "Do not merge" into eclair
Xavier Ducrohet [Thu, 21 Jan 2010 01:54:12 +0000 (17:54 -0800)]
am
d1da5fa2: Revert "SDK doc change: Add doc update for NDKr3."
Merge commit '
d1da5fa2da9690be94929e391a4e66b9986573bc' into eclair-plus-aosp
* commit '
d1da5fa2da9690be94929e391a4e66b9986573bc':
Revert "SDK doc change: Add doc update for NDKr3."
Xavier Ducrohet [Thu, 21 Jan 2010 01:45:18 +0000 (17:45 -0800)]
Revert "SDK doc change: Add doc update for NDKr3."
This reverts commit
1dced50963312c5d340cbd129d0017d9cbb45f0b.
Grace Kloba [Thu, 21 Jan 2010 01:40:30 +0000 (17:40 -0800)]
am
89e3c1ab: Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair
Merge commit '
89e3c1ab017717b619b27ca312d87918981004ca' into eclair-plus-aosp
* commit '
89e3c1ab017717b619b27ca312d87918981004ca':
Fix the sloppy detection in the ScaleGestureDetector.
Grace Kloba [Thu, 21 Jan 2010 01:36:50 +0000 (17:36 -0800)]
Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair
Grace Kloba [Wed, 20 Jan 2010 22:10:31 +0000 (14:10 -0800)]
Fix the sloppy detection in the ScaleGestureDetector.
Fix http://b/issue?id=
2385061
Xavier Ducrohet [Thu, 21 Jan 2010 01:33:49 +0000 (17:33 -0800)]
am
38f7a02a: Merge "SDK doc change: Add doc update for NDKr3." into eclair
Merge commit '
38f7a02a9b41f4bdc3f863b3eb33859e7c14cb8d' into eclair-plus-aosp
* commit '
38f7a02a9b41f4bdc3f863b3eb33859e7c14cb8d':
SDK doc change: Add doc update for NDKr3.
Xavier Ducrohet [Thu, 21 Jan 2010 01:30:27 +0000 (17:30 -0800)]
Merge "SDK doc change: Add doc update for NDKr3." into eclair
Scott Main [Thu, 21 Jan 2010 01:15:09 +0000 (17:15 -0800)]
am
2a79defa: Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair
Merge commit '
2a79defa5a0481e4dd980938da13adc767e0b231' into eclair-plus-aosp
* commit '
2a79defa5a0481e4dd980938da13adc767e0b231':
docs: add guide to copying and installing the Dev Tools app
Scott Main [Thu, 21 Jan 2010 01:10:25 +0000 (17:10 -0800)]
Merge "docs: add guide to copying and installing the Dev Tools app from the emulator to a device." into eclair
Scott Main [Wed, 20 Jan 2010 22:11:56 +0000 (14:11 -0800)]
docs: add guide to copying and installing the Dev Tools app
from the emulator to a device.
Irfan Sheriff [Wed, 20 Jan 2010 21:30:17 +0000 (13:30 -0800)]
am
48ef378d: Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair
Merge commit '
48ef378d01b3ace349cbb6ba564276b854d872c9' into eclair-plus-aosp
* commit '
48ef378d01b3ace349cbb6ba564276b854d872c9':
DO NOT MERGE Avoid wifi disable in a UNKNOWN state
Robert Greenwalt [Wed, 20 Jan 2010 21:30:11 +0000 (13:30 -0800)]
am
1a337547: Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair
Merge commit '
1a337547d5377c57dbb10a24d4d73ad6bda829ea' into eclair-plus-aosp
* commit '
1a337547d5377c57dbb10a24d4d73ad6bda829ea':
Add bugreport info about network feature use. DO NOT MERGE
Mike Reed [Wed, 20 Jan 2010 14:38:04 +0000 (09:38 -0500)]
Do not merge
port stretchy from master
Irfan Sheriff [Wed, 20 Jan 2010 21:26:08 +0000 (13:26 -0800)]
Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair
Robert Greenwalt [Wed, 20 Jan 2010 21:26:04 +0000 (13:26 -0800)]
Merge "Add bugreport info about network feature use. DO NOT MERGE" into eclair
Mike Reed [Wed, 20 Jan 2010 21:21:26 +0000 (13:21 -0800)]
am
9f954cf2: Merge "Do not merge" into eclair
Merge commit '
9f954cf27e9e2bb94c836b1686c0e07500234b27' into eclair-plus-aosp
* commit '
9f954cf27e9e2bb94c836b1686c0e07500234b27':
Do not merge
Mike Reed [Wed, 20 Jan 2010 21:17:49 +0000 (13:17 -0800)]
Merge "Do not merge" into eclair
Robert Greenwalt [Tue, 22 Dec 2009 02:24:07 +0000 (18:24 -0800)]
Add bugreport info about network feature use. DO NOT MERGE
Backported from master change Ib9285359.
We've had a couple bug reports showing the effects of a left-live feature request.
We need a bit more bugreport-time logging.
bug:
2323226
bug:
2377507
change-id: I296b2887101c260aea678bf6db91144535cbad7e
Robert Greenwalt [Wed, 20 Jan 2010 19:12:40 +0000 (11:12 -0800)]
am
8c166512: Merge "Cleanup of process-specific DNS." into eclair
Merge commit '
8c166512a7e6ffaf87e41cd3a85d55993648fe9b' into eclair-plus-aosp
* commit '
8c166512a7e6ffaf87e41cd3a85d55993648fe9b':
Cleanup of process-specific DNS.
Robert Greenwalt [Wed, 20 Jan 2010 19:08:13 +0000 (11:08 -0800)]
Merge "Cleanup of process-specific DNS." into eclair
Irfan Sheriff [Fri, 8 Jan 2010 17:36:04 +0000 (09:36 -0800)]
DO NOT MERGE Avoid wifi disable in a UNKNOWN state
Multiple broadcast receiver unregister calls cause exception.
Bug:
2361335
Mike Lockwood [Wed, 20 Jan 2010 18:04:13 +0000 (10:04 -0800)]
am
bb79e5fd: Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair
Merge commit '
bb79e5fdb52eb86963fc688e6a455451b6e1a867' into eclair-plus-aosp
* commit '
bb79e5fdb52eb86963fc688e6a455451b6e1a867':
Be tolerant of GPS session and engine on status messages arriving out of order.
Mike Lockwood [Wed, 20 Jan 2010 18:00:55 +0000 (10:00 -0800)]
Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair
Xavier Ducrohet [Wed, 20 Jan 2010 17:47:06 +0000 (09:47 -0800)]
am
b44051ee: Merge "ADT/Layoutlib: implement sweep gradient." into eclair
Merge commit '
b44051eee04450888a7dcb1cd2e6f31d0edfb678' into eclair-plus-aosp
* commit '
b44051eee04450888a7dcb1cd2e6f31d0edfb678':
ADT/Layoutlib: implement sweep gradient.
Xavier Ducrohet [Wed, 20 Jan 2010 17:43:46 +0000 (09:43 -0800)]
Merge "ADT/Layoutlib: implement sweep gradient." into eclair
Mike Lockwood [Wed, 20 Jan 2010 15:14:54 +0000 (10:14 -0500)]
Be tolerant of GPS session and engine on status messages arriving out of order.
BUG:
2366194
Change-Id: I642dacd397202f671adba5a863394438ca62988d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Scott Main [Wed, 20 Jan 2010 03:59:24 +0000 (19:59 -0800)]
am
5615ca19: docs: a lot of revision and expansion of the hello view tutorials includes new screenshots for some tutorials and a new sample images zip file
Merge commit '
5615ca1979caa79041bf16a2cae49f9cfadd7ee5' into eclair-plus-aosp
* commit '
5615ca1979caa79041bf16a2cae49f9cfadd7ee5':
docs: a lot of revision and expansion of the hello view tutorials
Adam Powell [Wed, 20 Jan 2010 03:59:19 +0000 (19:59 -0800)]
am
5910cb53: Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair
Merge commit '
5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28' into eclair-plus-aosp
* commit '
5910cb53ea7085dff4c8c6b9c1edde5a1b59fa28':
Edge of screen slop detection for ScaleGestureDetector.
Scott Main [Wed, 20 Jan 2010 03:59:13 +0000 (19:59 -0800)]
am
de54a95b: Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair
Merge commit '
de54a95b98b9d80c10ca2788b83386094222cb4f' into eclair-plus-aosp
* commit '
de54a95b98b9d80c10ca2788b83386094222cb4f':
docs: add a section about debugging web pages with the Console APIs;
Dianne Hackborn [Wed, 20 Jan 2010 03:59:04 +0000 (19:59 -0800)]
am
b1c4a2a3: Fix issue #
2364506: Phone locked up while listening to music and attempting to download an update
Merge commit '
b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7' into eclair-plus-aosp
* commit '
b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7':
Fix issue #
2364506: Phone locked up while listening to music and attempting to download an update
Scott Main [Wed, 16 Dec 2009 03:38:16 +0000 (19:38 -0800)]
docs: a lot of revision and expansion of the hello view tutorials
includes new screenshots for some tutorials and a new sample images
zip file
Bug:
2338253
Xavier Ducrohet [Wed, 20 Jan 2010 02:51:06 +0000 (18:51 -0800)]
ADT/Layoutlib: implement sweep gradient.
Change-Id: I2d460decff82f5f64b0a5cfeaa68156aad4fb3e6
Robert Greenwalt [Thu, 17 Dec 2009 22:54:59 +0000 (14:54 -0800)]
Cleanup of process-specific DNS.
Backport of MR2 change
421c72b6.
Removes entries sooner. A bug.
Doesn't add one for phone process at all. This was intended to be removed long ago.
bug:
2329900
bug:
2377507
Adam Powell [Wed, 20 Jan 2010 00:40:17 +0000 (16:40 -0800)]
Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair
Adam Powell [Wed, 20 Jan 2010 00:33:46 +0000 (16:33 -0800)]
Edge of screen slop detection for ScaleGestureDetector.
Scott Main [Wed, 20 Jan 2010 00:18:52 +0000 (16:18 -0800)]
Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair
Scott Main [Sat, 16 Jan 2010 01:26:29 +0000 (17:26 -0800)]
docs: add a section about debugging web pages with the Console APIs;
revise and cleanup some of the other content.
Bug:
2353529
Dianne Hackborn [Tue, 19 Jan 2010 23:36:42 +0000 (15:36 -0800)]
Fix issue #
2364506: Phone locked up while listening to music and attempting to download an update
Make sure calls into the notification manager are not done with the
activity manager lock held.
Change-Id: Ib53c3b9f46160d94ee1e7079b1a5123e0d1225d8
Xavier Ducrohet [Tue, 19 Jan 2010 22:53:52 +0000 (14:53 -0800)]
am
6866daee: Merge "ADT/Layoutlib: implement radial gradient." into eclair
Merge commit '
6866daee6a18992e8f2c9a948e873bbfc2090fb0' into eclair-plus-aosp
* commit '
6866daee6a18992e8f2c9a948e873bbfc2090fb0':
ADT/Layoutlib: implement radial gradient.
Ying Wang [Tue, 19 Jan 2010 22:53:47 +0000 (14:53 -0800)]
am
b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair
Merge commit '
b5fb50a133c6fc7fc93d6241912dd9ec24de6ace' into eclair-plus-aosp
* commit '
b5fb50a133c6fc7fc93d6241912dd9ec24de6ace':
Add instrumentation as a source tag for proguard keep options.
Xavier Ducrohet [Tue, 19 Jan 2010 22:48:58 +0000 (14:48 -0800)]
Merge "ADT/Layoutlib: implement radial gradient." into eclair
Xavier Ducrohet [Tue, 19 Jan 2010 18:20:43 +0000 (10:20 -0800)]
ADT/Layoutlib: implement radial gradient.
Also refactored some parts of LinearGradient to reuse them
in the radial gradient
Change-Id: I2ec69bd60190bd014217d989177dcc7269188dea
Mike Reed [Tue, 19 Jan 2010 21:38:53 +0000 (16:38 -0500)]
Do not merge
roll 1-line fix from master here. Fixes crasher when apps use custom fonts
fixes http://code.google.com/p/android/issues/detail?id=6030
Ying Wang [Tue, 19 Jan 2010 19:55:12 +0000 (11:55 -0800)]
Merge "Add instrumentation as a source tag for proguard keep options." into eclair
Guang Zhu [Tue, 19 Jan 2010 19:54:05 +0000 (11:54 -0800)]
am
ccec75e7: Merge "Prevent orientation change from triggering activity recreation." into eclair
Merge commit '
ccec75e7a842f8ba26617406768206eb3be32222' into eclair-plus-aosp
* commit '
ccec75e7a842f8ba26617406768206eb3be32222':
Prevent orientation change from triggering activity recreation.
Amith Yamasani [Tue, 19 Jan 2010 19:53:59 +0000 (11:53 -0800)]
am
b35b8c13: Merge "Security fix in accessibility - don\'t read out password. #
2371557" into eclair
Merge commit '
b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe' into eclair-plus-aosp
* commit '
b35b8c1334b8bb8c4fb8b679fdb0b9bcbd5b41fe':
Security fix in accessibility - don't read out password. #
2371557
Guang Zhu [Tue, 19 Jan 2010 19:53:00 +0000 (11:53 -0800)]
Merge "Prevent orientation change from triggering activity recreation." into eclair
Guang Zhu [Tue, 19 Jan 2010 19:51:44 +0000 (11:51 -0800)]
Prevent orientation change from triggering activity recreation.
Amith Yamasani [Tue, 19 Jan 2010 19:50:39 +0000 (11:50 -0800)]
Merge "Security fix in accessibility - don't read out password. #
2371557" into eclair
Scott Main [Tue, 19 Jan 2010 19:21:58 +0000 (11:21 -0800)]
am
88e653f6: Merge "docs: some spelling typos" into eclair
Merge commit '
88e653f6653aeb237631681f6700f0e572779617' into eclair-plus-aosp
* commit '
88e653f6653aeb237631681f6700f0e572779617':
docs: some spelling typos
Scott Main [Tue, 19 Jan 2010 19:18:39 +0000 (11:18 -0800)]
Merge "docs: some spelling typos" into eclair
Scott Main [Tue, 19 Jan 2010 19:12:07 +0000 (11:12 -0800)]
docs: some spelling typos
Grace Kloba [Tue, 19 Jan 2010 07:43:37 +0000 (23:43 -0800)]
Grace Kloba [Tue, 19 Jan 2010 07:43:32 +0000 (23:43 -0800)]
Grace Kloba [Tue, 19 Jan 2010 07:43:27 +0000 (23:43 -0800)]
Grace Kloba [Tue, 19 Jan 2010 07:43:20 +0000 (23:43 -0800)]
am
d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair
Merge commit '
d79d1c72991e587294432e80d091e3ae26a0c103' into eclair-plus-aosp
* commit '
d79d1c72991e587294432e80d091e3ae26a0c103':
If ZoomButttonsController detects more than one pointer,
Grace Kloba [Tue, 19 Jan 2010 07:43:14 +0000 (23:43 -0800)]
am
f080a5ad: Merge "DO NOT MERGE" into eclair
Merge commit '
f080a5adf6d59bade46815ee605a3829e5c3ab89' into eclair-plus-aosp
* commit '
f080a5adf6d59bade46815ee605a3829e5c3ab89':
DO NOT MERGE
Jim Miller [Tue, 19 Jan 2010 07:43:01 +0000 (23:43 -0800)]
am
813d2d86: Merge "Fix for
2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
Merge commit '
813d2d86789d1c2e705c4d11d052ad649e6bac84' into eclair-plus-aosp
* commit '
813d2d86789d1c2e705c4d11d052ad649e6bac84':
Fix for
2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
Xavier Ducrohet [Tue, 19 Jan 2010 07:42:55 +0000 (23:42 -0800)]
am
908a8111: Merge "ADT/Layoutlib: Add dash support to stroke." into eclair
Merge commit '
908a81119061092468067789acbec9b99d79ad5f' into eclair-plus-aosp
* commit '
908a81119061092468067789acbec9b99d79ad5f':
ADT/Layoutlib: Add dash support to stroke.
Xavier Ducrohet [Tue, 19 Jan 2010 07:42:28 +0000 (23:42 -0800)]
am
2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke information." into eclair
Merge commit '
2b30a4a50e24080fdd8b796e4a64447f223d4522' into eclair-plus-aosp
* commit '
2b30a4a50e24080fdd8b796e4a64447f223d4522':
ADT/Layoutlib: properly handle stroke information.
Grace Kloba [Sat, 16 Jan 2010 01:11:27 +0000 (17:11 -0800)]
DO NOT MERGE
If pinched to overview mode, double tap should bring
it back to default instead of just setting the current
mode as overview mode.
Grace Kloba [Sat, 16 Jan 2010 00:08:17 +0000 (16:08 -0800)]
DO NOT MERGE
Make sure the mZoomOverviewWidth is as least as
wide as the current (adjusted) view width.
This should fix the weird state Bart got in with
m.wikipedia.org.
Grace Kloba [Sat, 16 Jan 2010 00:02:57 +0000 (16:02 -0800)]
DO NOT MERGE
Remove testing (enable plugin) code.
No reflow when zoom in, auto reflow when zoom out.
Fix http://b/issue?id=
2375955
Grace Kloba [Mon, 18 Jan 2010 23:21:38 +0000 (15:21 -0800)]
Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair
Grace Kloba [Mon, 18 Jan 2010 23:21:31 +0000 (15:21 -0800)]
Merge "DO NOT MERGE" into eclair
Grace Kloba [Mon, 18 Jan 2010 18:43:59 +0000 (10:43 -0800)]
If ZoomButttonsController detects more than one pointer,
give up the control. This should enable the View behind
it, like WebView, will always get the multi-pointer
events even when ZoomButtonsController is up.
Jim Miller [Sat, 16 Jan 2010 01:20:29 +0000 (17:20 -0800)]
Merge "Fix for
2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
Grace Kloba [Sat, 16 Jan 2010 00:35:40 +0000 (16:35 -0800)]
DO NOT MERGE
Bring back +/- when panning. Dismiss it when pinching.
Jim Miller [Sat, 16 Jan 2010 00:20:36 +0000 (16:20 -0800)]
Fix for
2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
The previous workaround for this race condition prevented glitches by postponing drawing the SlidingTab until the internal state was consistent.
Unfortunately, the InCallScreen seems to trigger this most of the time if the keyboard is open or the last application was in landscape mode.
Instead, we'll handle this separately in lockscreen.
Xavier Ducrohet [Fri, 15 Jan 2010 22:27:34 +0000 (14:27 -0800)]
Merge "ADT/Layoutlib: Add dash support to stroke." into eclair
Xavier Ducrohet [Fri, 15 Jan 2010 19:24:44 +0000 (11:24 -0800)]
ADT/Layoutlib: Add dash support to stroke.
Change-Id: I09a7e84948be013cbb11f6d9774ab81df897b424
Xavier Ducrohet [Fri, 15 Jan 2010 18:30:52 +0000 (10:30 -0800)]
Merge "ADT/Layoutlib: properly handle stroke information." into eclair
Xavier Ducrohet [Fri, 15 Jan 2010 03:19:06 +0000 (19:19 -0800)]
ADT/Layoutlib: properly handle stroke information.
Change-Id: Iec9284d0e65d1313739e361d1fd5a522646fd1fd
Grace Kloba [Fri, 15 Jan 2010 03:32:45 +0000 (19:32 -0800)]
am
4d69ac66: Merge "DO NOT MERGE" into eclair
Merge commit '
4d69ac6695246b8df06a6583044dc4712d81a956' into eclair-plus-aosp
* commit '
4d69ac6695246b8df06a6583044dc4712d81a956':
DO NOT MERGE
Grace Kloba [Fri, 15 Jan 2010 03:32:39 +0000 (19:32 -0800)]
am
d1019a99: Merge "DO NOT MERGE" into eclair
Merge commit '
d1019a99f9b458a4129e047c96de7192a61e5e99' into eclair-plus-aosp
* commit '
d1019a99f9b458a4129e047c96de7192a61e5e99':
DO NOT MERGE
Grace Kloba [Fri, 15 Jan 2010 03:29:09 +0000 (19:29 -0800)]
Merge "DO NOT MERGE" into eclair
Grace Kloba [Fri, 15 Jan 2010 03:28:55 +0000 (19:28 -0800)]
Merge "DO NOT MERGE" into eclair
Xavier Ducrohet [Fri, 15 Jan 2010 03:15:28 +0000 (19:15 -0800)]
am
79f05bb4: Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair
Merge commit '
79f05bb4a502d5768f84cf975f791f3ba981e0e5' into eclair-plus-aosp
* commit '
79f05bb4a502d5768f84cf975f791f3ba981e0e5':
ADT/Layoutlib: improved gradient drawing for perf.
Xavier Ducrohet [Fri, 15 Jan 2010 03:15:22 +0000 (19:15 -0800)]
am
89d538dc: ADT/Layoutlib: don\'t draw 0-sized rectangle, AWT doesn\'t like that.
Merge commit '
89d538dcca9a4cb95682c56b0c4b85e8a77442be' into eclair-plus-aosp
* commit '
89d538dcca9a4cb95682c56b0c4b85e8a77442be':
ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
Xavier Ducrohet [Fri, 15 Jan 2010 03:10:44 +0000 (19:10 -0800)]
Merge "ADT/Layoutlib: improved gradient drawing for perf." into eclair
Amith Yamasani [Fri, 15 Jan 2010 02:56:02 +0000 (18:56 -0800)]
Security fix in accessibility - don't read out password. #
2371557
Check for password type before send accessibility event.
[Submitting for Svet]
Xavier Ducrohet [Fri, 15 Jan 2010 02:45:04 +0000 (18:45 -0800)]
ADT/Layoutlib: improved gradient drawing for perf.
Change-Id: I79b909d7787e4442e7cfdf196de1ac0c077da7f8
Xavier Ducrohet [Fri, 15 Jan 2010 02:39:48 +0000 (18:39 -0800)]
am
240298f9: Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair
Merge commit '
240298f9e4542c487edd0337e84b50c493cbeecd' into eclair-plus-aosp
* commit '
240298f9e4542c487edd0337e84b50c493cbeecd':
ADT/Layoutlib: always use custom gradient (java) Paint.
Xavier Ducrohet [Fri, 15 Jan 2010 02:37:21 +0000 (18:37 -0800)]
ADT/Layoutlib: don't draw 0-sized rectangle, AWT doesn't like that.
Change-Id: I298d00208ace2421478c5864cc5a66a508b2b411
Xavier Ducrohet [Fri, 15 Jan 2010 02:36:26 +0000 (18:36 -0800)]
Merge "ADT/Layoutlib: always use custom gradient (java) Paint." into eclair
Grace Kloba [Fri, 15 Jan 2010 02:30:45 +0000 (18:30 -0800)]
DO NOT MERGE
When adjust scale for zoom overview, keep the state
of whether textWrapScale is matching mActualScale.
So if user pinch during loading, we won't reflow.
Fix http://b/issue?id=
2370552
Grace Kloba [Fri, 15 Jan 2010 02:18:41 +0000 (18:18 -0800)]
DO NOT MERGE
If mViewportWidth is 0, it means screen width. If
textwrapWidth is not same as view width, which means
that we are in the state triggered by pinch, always
send textwrapWidth as width to WebKit to keep the
same layout.
Fix http://b/issue?id=
2375232
Roman Nurik [Fri, 15 Jan 2010 01:20:09 +0000 (17:20 -0800)]
am
6a739ea8: Merge "Updated developer groups documentation to point to Stack Overflow, also rearranged a few things." into eclair
Merge commit '
6a739ea88d33f901172d60b0de0f442f2dc485cc' into eclair-plus-aosp
* commit '
6a739ea88d33f901172d60b0de0f442f2dc485cc':
Updated developer groups documentation to point to Stack Overflow, also rearranged a few things.
Xavier Ducrohet [Fri, 15 Jan 2010 01:20:04 +0000 (17:20 -0800)]
am
b847fbf2: Merge "ADT/Layout: support for 3+ color in linear gradients" into eclair
Merge commit '
b847fbf2098acc8c5854bbbfa1453431128c720e' into eclair-plus-aosp
* commit '
b847fbf2098acc8c5854bbbfa1453431128c720e':
ADT/Layout: support for 3+ color in linear gradients
Roman Nurik [Fri, 15 Jan 2010 01:18:31 +0000 (17:18 -0800)]
Merge "Updated developer groups documentation to point to Stack Overflow, also rearranged a few things." into eclair
Xavier Ducrohet [Fri, 15 Jan 2010 01:14:05 +0000 (17:14 -0800)]
ADT/Layoutlib: always use custom gradient (java) Paint.
The normal linear paint from AWT does not support our TileModes.
Change-Id: I24667671dabdf1a5dffa342e4de9cc69487db0b6
Xavier Ducrohet [Fri, 15 Jan 2010 01:15:56 +0000 (17:15 -0800)]
Merge "ADT/Layout: support for 3+ color in linear gradients" into eclair
John Wang [Fri, 15 Jan 2010 01:07:30 +0000 (17:07 -0800)]
am
99f2a4bb: Merge "Add Event log for RAT switch." into eclair
Merge commit '
99f2a4bb519e390eacc9807443c74ca05f176242' into eclair-plus-aosp
* commit '
99f2a4bb519e390eacc9807443c74ca05f176242':
Add Event log for RAT switch.
John Wang [Fri, 15 Jan 2010 00:43:38 +0000 (16:43 -0800)]
Merge "Add Event log for RAT switch." into eclair
Roman Nurik [Fri, 8 Jan 2010 20:48:45 +0000 (12:48 -0800)]
Updated developer groups documentation to point to Stack Overflow, also rearranged a few things.
Joe Onorato [Thu, 14 Jan 2010 23:58:37 +0000 (15:58 -0800)]
am
836e1666: Merge "add drawSpriteScreenspaceCropped to renderscript" into eclair
Merge commit '
836e16666ec31dfe7559bcbe5710a97700c383f9' into eclair-plus-aosp
* commit '
836e16666ec31dfe7559bcbe5710a97700c383f9':
add drawSpriteScreenspaceCropped to renderscript
OSDN Git Service
