OSDN Git Service
Xavier Ducrohet [Sat, 9 Jan 2010 02:25:00 +0000 (18:25 -0800)]
am
1b790f29: am
cc2a0201: For now make ADT still use fill_parent instead of match_parent
Merge commit '
1b790f29ae553eb9e5431ab9c8cf7364b2e6ac76'
* commit '
1b790f29ae553eb9e5431ab9c8cf7364b2e6ac76':
For now make ADT still use fill_parent instead of match_parent
Xavier Ducrohet [Sat, 9 Jan 2010 02:22:12 +0000 (18:22 -0800)]
am
cc2a0201: For now make ADT still use fill_parent instead of match_parent
Merge commit '
cc2a02011f08f89cb7e9f1c129f8eb813348de38' into eclair-plus-aosp
* commit '
cc2a02011f08f89cb7e9f1c129f8eb813348de38':
For now make ADT still use fill_parent instead of match_parent
Xavier Ducrohet [Sat, 9 Jan 2010 02:18:06 +0000 (18:18 -0800)]
For now make ADT still use fill_parent instead of match_parent
Change-Id: I7d59600e036a630daaaac0cda53487c24ab0c3fc
Romain Guy [Sat, 9 Jan 2010 00:37:36 +0000 (16:37 -0800)]
am
f1b8c8de: (-s ours) am
c7db6b94: Deprecate fill_parent and introduce match_parent. (do not merge) Bug: #
2361749.
Merge commit '
f1b8c8de8417b007ac2c2f59bc581074923970a2'
* commit '
f1b8c8de8417b007ac2c2f59bc581074923970a2':
Deprecate fill_parent and introduce match_parent. (do not merge)
Xavier Ducrohet [Sat, 9 Jan 2010 00:37:32 +0000 (16:37 -0800)]
am
166864ba: am
cff0d285: ADT/GLE: Fix issue with the locale list refresh in the ConfigComposite
Merge commit '
166864ba59eb262152b6db14cfd51c5b630b7acd'
* commit '
166864ba59eb262152b6db14cfd51c5b630b7acd':
ADT/GLE: Fix issue with the locale list refresh in the ConfigComposite
Romain Guy [Sat, 9 Jan 2010 00:33:37 +0000 (16:33 -0800)]
am
c7db6b94: Deprecate fill_parent and introduce match_parent. (do not merge) Bug: #
2361749.
Merge commit '
c7db6b94f54decff38d48a5ed8725c80269ded95' into eclair-plus-aosp
* commit '
c7db6b94f54decff38d48a5ed8725c80269ded95':
Deprecate fill_parent and introduce match_parent. (do not merge)
Xavier Ducrohet [Sat, 9 Jan 2010 00:33:34 +0000 (16:33 -0800)]
am
cff0d285: ADT/GLE: Fix issue with the locale list refresh in the ConfigComposite
Merge commit '
cff0d285d79844c31be56ae49837d83e8742e512' into eclair-plus-aosp
* commit '
cff0d285d79844c31be56ae49837d83e8742e512':
ADT/GLE: Fix issue with the locale list refresh in the ConfigComposite
Romain Guy [Fri, 8 Jan 2010 23:07:24 +0000 (15:07 -0800)]
Deprecate fill_parent and introduce match_parent. (do not merge)
Bug: #
2361749.
Change-Id: I7a75cd7f0887dd8135c43f71d1b15165306bfa9b
Xavier Ducrohet [Sat, 9 Jan 2010 00:27:57 +0000 (16:27 -0800)]
am
52160821: am
aa58f6c0: ADT/GLE: Cleaned up the open/replace file process in the GLE and the config composite
Merge commit '
52160821911866f8c2d4e78bdf993e6407bc74e2'
* commit '
52160821911866f8c2d4e78bdf993e6407bc74e2':
ADT/GLE: Cleaned up the open/replace file process in the GLE and the config composite
Romain Guy [Fri, 8 Jan 2010 23:07:24 +0000 (15:07 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #
2361749.
Xavier Ducrohet [Fri, 8 Jan 2010 20:15:10 +0000 (12:15 -0800)]
am
aa58f6c0: ADT/GLE: Cleaned up the open/replace file process in the GLE and the config composite
Merge commit '
aa58f6c0cc7e6442bc2980e379fbf4595a011d7d' into eclair-plus-aosp
* commit '
aa58f6c0cc7e6442bc2980e379fbf4595a011d7d':
ADT/GLE: Cleaned up the open/replace file process in the GLE and the config composite
Xavier Ducrohet [Fri, 8 Jan 2010 19:30:23 +0000 (11:30 -0800)]
ADT/GLE: Fix issue with the locale list refresh in the ConfigComposite
One of the problem stemmed from the ResourceMonitor sending removed
resource events to the ResourceManager first and then to other listeners.
Other listeners then failed to get a corresponding ResourceFolder
or ResourceFile since it was deleted by the ResourceManager.
Solution: add a resource-specific change listener in the ResourceManager.
Using this listener is much more efficient as the ResourceFolder/File
do not need to be figured out by the listener from the IFolder/IFile.
Also renamed the ResourceMonitor as it's confusing (it listens to
Eclipse resource changes, not Android project resource changes).
Since it deals mostly with projects and their resources, and is
global and used by other monitor, it's now called GlobalProjectMonitor.
Also cleaned up the ResourceManager and LayoutReloadMonitor to
implements their interface as internal classes so that the
methods do not show up in their public API.
Change-Id: I1967a48364fd946c98d9eee5bd4a333fc01bea2d
Xavier Ducrohet [Fri, 8 Jan 2010 01:49:37 +0000 (17:49 -0800)]
ADT/GLE: Cleaned up the open/replace file process in the GLE and the config composite
The GLE and the config composite must handle 3 cases:
- new file opened following the creation of the editor
- replacement file when the user opens a different version of a layout
that's already opened. The editor stays and switch to the new file.
- replacement file whne the user change the configuration and a new
file that better matches the config is automicatlly opened.
Additionally, the editor/config composite must handle files being
opened while the SDK or the file's project's target are not yet
loaded.
File change or change in the SDK/Target must attempts to keep the
config/theme selection as close as possible as the previous state
while still remaining compatible with the new file/sdk/target.
Also removed the duplicate ITargetChangeListener, by making the
one in AndroidEditor optional (constructor flag), so that the
one in GraphicalLayoutEditor/Part is the only one used in the GLE
(it gives us more control on the order in which the code previously
executed by both listeners is now executed).
Also split the themes and locales updates as they happen on
different triggers.
Change-Id: If6d73bbe8af11cd221fb7830a37ffcc163135fc4
Xavier Ducrohet [Fri, 8 Jan 2010 00:24:13 +0000 (16:24 -0800)]
am
4c260522: am
5a5e30a4: ADT/GLE: Improve the config selector.
Merge commit '
4c2605224e0f917dcdd2ba47197d508f2f4c4347'
* commit '
4c2605224e0f917dcdd2ba47197d508f2f4c4347':
ADT/GLE: Improve the config selector.
Xavier Ducrohet [Fri, 8 Jan 2010 00:22:33 +0000 (16:22 -0800)]
am
5a5e30a4: ADT/GLE: Improve the config selector.
Merge commit '
5a5e30a49ae8ac966650d013359f8b7c13b63d0b' into eclair-plus-aosp
* commit '
5a5e30a49ae8ac966650d013359f8b7c13b63d0b':
ADT/GLE: Improve the config selector.
Xavier Ducrohet [Thu, 7 Jan 2010 22:03:20 +0000 (14:03 -0800)]
am
071472b4: am
7e23cf22: Fix the locale selection in the config selector.
Merge commit '
071472b4cdb8f21f466c45b86ca6f76efdb8cfda'
* commit '
071472b4cdb8f21f466c45b86ca6f76efdb8cfda':
Fix the locale selection in the config selector.
Xavier Ducrohet [Thu, 7 Jan 2010 21:59:38 +0000 (13:59 -0800)]
am
7e23cf22: Fix the locale selection in the config selector.
Merge commit '
7e23cf2298572bc7ed6dc0cb731a8d55337b94a1' into eclair-plus-aosp
* commit '
7e23cf2298572bc7ed6dc0cb731a8d55337b94a1':
Fix the locale selection in the config selector.
Xavier Ducrohet [Thu, 7 Jan 2010 01:21:48 +0000 (17:21 -0800)]
ADT/GLE: Improve the config selector.
- Better support for device/config, properly select config when opening
files, proper support for files that have different config versions
- Better language support, with default values and languages
with no regions.
- (attempt to) Properly set locale combo when opening files
- attempt to keep a somewhat compatible config when changing
device.
- general clean up of the API. More to come.
Change-Id: I45652bb18e6a61b443a7f0c1087a9b2d3f81e033
Xavier Ducrohet [Thu, 7 Jan 2010 17:21:24 +0000 (09:21 -0800)]
am
79303b29: am
3917a7db: Move LayoutLib API library to sdk.git
Merge commit '
79303b290b6cd43666aa6283cfacb9c7fffa4073'
* commit '
79303b290b6cd43666aa6283cfacb9c7fffa4073':
Move LayoutLib API library to sdk.git
Xavier Ducrohet [Thu, 7 Jan 2010 17:16:11 +0000 (09:16 -0800)]
am
3917a7db: Move LayoutLib API library to sdk.git
Merge commit '
3917a7db4e9e637698405901557c6f9826acc051' into eclair-plus-aosp
* commit '
3917a7db4e9e637698405901557c6f9826acc051':
Move LayoutLib API library to sdk.git
Xavier Ducrohet [Wed, 6 Jan 2010 23:12:12 +0000 (15:12 -0800)]
Fix the locale selection in the config selector.
default locale means nothing. Instead we replace it with
- "any" if there are no resources specific to a locale in the project.
- "other" if there are resources specific to a locale in the project.
In both case, the actual locale used by the config is hard-coded to
a value that cannot be used by the resources ("__" for the language,
and "__" for the region), to enforce using the default resources.
Using a config with no language nor region had the effect to take
the first resources with a valid qualifier for language and/or
region.
Change-Id: I67a34d1a026a5d3d5e1438d3763ae27c5ed0ce55
Xavier Ducrohet [Thu, 7 Jan 2010 16:30:01 +0000 (08:30 -0800)]
Move LayoutLib API library to sdk.git
Change-Id: I8a54705a75d79c743e59c763ed2464408a836ebf
Xavier Ducrohet [Tue, 5 Jan 2010 19:34:03 +0000 (11:34 -0800)]
am
300d8797: am
550f89bf: ADT/GLE2: send new width/heigh when in explode mode instead of original ones.
Merge commit '
300d8797cc8988d1884b2798aeea4ec6d00f6ff8'
* commit '
300d8797cc8988d1884b2798aeea4ec6d00f6ff8':
ADT/GLE2: send new width/heigh when in explode mode instead of original ones.
Xavier Ducrohet [Tue, 5 Jan 2010 19:23:07 +0000 (11:23 -0800)]
am
550f89bf: ADT/GLE2: send new width/heigh when in explode mode instead of original ones.
Merge commit '
550f89bfec273152e3f6bb54c1f97646c7cf55a5' into eclair-plus-aosp
* commit '
550f89bfec273152e3f6bb54c1f97646c7cf55a5':
ADT/GLE2: send new width/heigh when in explode mode instead of original ones.
Xavier Ducrohet [Tue, 5 Jan 2010 18:30:55 +0000 (10:30 -0800)]
ADT/GLE2: send new width/heigh when in explode mode instead of original ones.
Change-Id: I9f0743ad6c3a79254c1296f78a9845dbf6c65ca5
Jean-Baptiste Queru [Tue, 5 Jan 2010 18:18:19 +0000 (10:18 -0800)]
Merge "Don't look for resources where there aren't any."
Raphael [Mon, 4 Jan 2010 22:51:35 +0000 (14:51 -0800)]
am
a972f233: am
85b71f0b: ADT GLE: defer drop to first parent view that accepts it.
Merge commit '
a972f2332cc71ded4cfb26dbcdbc5c283771b3f1'
* commit '
a972f2332cc71ded4cfb26dbcdbc5c283771b3f1':
ADT GLE: defer drop to first parent view that accepts it.
Raphael [Mon, 4 Jan 2010 22:49:17 +0000 (14:49 -0800)]
am
85b71f0b: ADT GLE: defer drop to first parent view that accepts it.
Merge commit '
85b71f0b039e7d100376126d4314d90fad578ce5' into eclair-plus-aosp
* commit '
85b71f0b039e7d100376126d4314d90fad578ce5':
ADT GLE: defer drop to first parent view that accepts it.
Raphael [Mon, 4 Jan 2010 22:44:04 +0000 (14:44 -0800)]
ADT GLE: defer drop to first parent view that accepts it.
Change-Id: I021539e26a1feb0f5a89d907142ed4532fae8320
Raphael [Mon, 4 Jan 2010 21:49:52 +0000 (13:49 -0800)]
am
91486d94: am
26ecc760: ADT GRE: move scripts to ADT /gscripts.
Merge commit '
91486d94eb14f80c62e3d3a62fe32e6db148c014'
* commit '
91486d94eb14f80c62e3d3a62fe32e6db148c014':
ADT GRE: move scripts to ADT /gscripts.
Raphael [Mon, 4 Jan 2010 21:40:44 +0000 (13:40 -0800)]
am
26ecc760: ADT GRE: move scripts to ADT /gscripts.
Merge commit '
26ecc760b9abbd827c6587a9bb61ca29a6bc95ae' into eclair-plus-aosp
* commit '
26ecc760b9abbd827c6587a9bb61ca29a6bc95ae':
ADT GRE: move scripts to ADT /gscripts.
Raphael [Mon, 4 Jan 2010 21:29:09 +0000 (13:29 -0800)]
ADT GRE: move scripts to ADT /gscripts.
So right now we have:
- some GRE/GLE code in internal that uses the scripts
- the "public" bases client classes in ADT src/gscripts (not internal)
- the "client scripts" in ADT /gscripts.
- projects use their own /gscripts folder.
Change-Id: I899d272233f35f493317a56fde60eb7e4a257c7a
Jean-Baptiste Queru [Sat, 19 Dec 2009 01:36:33 +0000 (17:36 -0800)]
Don't look for resources where there aren't any.
This fixes "/bin/bash: line 0: cd: sdk/layoutopt/app/src/resources: No such file or directory"
Change-Id: Id7598f93f19c9812c7d61ce8f7416e6ae3cd497b
Raphael [Mon, 4 Jan 2010 01:06:58 +0000 (17:06 -0800)]
am
41164d30: am
8fbb33e2: ADT GRE (Groovy Rules Engine), drag\'n\'drop.
Merge commit '
41164d3012f75dd2688e283167e91b1236c1c035'
* commit '
41164d3012f75dd2688e283167e91b1236c1c035':
ADT GRE (Groovy Rules Engine), drag'n'drop.
Raphael [Mon, 4 Jan 2010 01:03:13 +0000 (17:03 -0800)]
am
8fbb33e2: ADT GRE (Groovy Rules Engine), drag\'n\'drop.
Merge commit '
8fbb33e21e7b6c0d13c9b368c4a24f6c13809027' into eclair-plus-aosp
* commit '
8fbb33e21e7b6c0d13c9b368c4a24f6c13809027':
ADT GRE (Groovy Rules Engine), drag'n'drop.
Raphael [Sat, 2 Jan 2010 00:01:08 +0000 (16:01 -0800)]
ADT GRE (Groovy Rules Engine), drag'n'drop.
Start support for drag'n'drop. with visual feedback.
Change-Id: I27f896c2e954dec0cb43103417d888d8df5a288e
Raphael [Tue, 29 Dec 2009 22:24:52 +0000 (14:24 -0800)]
am
933db8d6: am
4b26e044: ADT GRE (Groovy Rules Engine), part 1.
Merge commit '
933db8d62db6769c1c17937a3a5816188baae257'
* commit '
933db8d62db6769c1c17937a3a5816188baae257':
ADT GRE (Groovy Rules Engine), part 1.
Raphael [Tue, 29 Dec 2009 22:24:42 +0000 (14:24 -0800)]
am
da2077e3: am
4ad5b5f5: ADT: Refactor in ViewElementDescriptor.
Merge commit '
da2077e394641b54b4d94404829403bc0eff59e4'
* commit '
da2077e394641b54b4d94404829403bc0eff59e4':
ADT: Refactor in ViewElementDescriptor.
Raphael [Tue, 29 Dec 2009 22:20:28 +0000 (14:20 -0800)]
am
4b26e044: ADT GRE (Groovy Rules Engine), part 1.
Merge commit '
4b26e04436587890f9245eda631f643d21f28d0d' into eclair-plus-aosp
* commit '
4b26e04436587890f9245eda631f643d21f28d0d':
ADT GRE (Groovy Rules Engine), part 1.
Raphael [Tue, 29 Dec 2009 22:20:24 +0000 (14:20 -0800)]
am
4ad5b5f5: ADT: Refactor in ViewElementDescriptor.
Merge commit '
4ad5b5f5933425e4416c5ef4434e0c8c16ccf0a8' into eclair-plus-aosp
* commit '
4ad5b5f5933425e4416c5ef4434e0c8c16ccf0a8':
ADT: Refactor in ViewElementDescriptor.
Raphael [Sat, 26 Dec 2009 18:53:03 +0000 (10:53 -0800)]
ADT GRE (Groovy Rules Engine), part 1.
This CL adds the new "Groovy Rules Engine" (GRE) to the GLE2.
The rules engine can load groovy files located in the ADT
namespace or the project associated with the current GLE2.
Each groovy file defines a class with callbacks invoked
by the LayoutCanvas.
Project rules are reloaded when they change.
Change-Id: I168234da739b2120374d3eb4552169f7dd36439d
Raphael [Sun, 27 Dec 2009 05:27:14 +0000 (21:27 -0800)]
ADT: Refactor in ViewElementDescriptor.
This changes the member "CanonicalClassName" into "FullClassName"
since the value is the FQCN of the java View.
Change-Id: Idbfcf665c12c598f680fdf58ecb0ae7820da8bdb
Raphael [Sun, 20 Dec 2009 19:02:28 +0000 (11:02 -0800)]
am
08faf36b: am
47e775d0: Merge change Iaadf3b84 into eclair
Merge commit '
08faf36bc3f8f1e9b79fc14fef6b9aa63fccee34'
* commit '
08faf36bc3f8f1e9b79fc14fef6b9aa63fccee34':
ADT: Fix potential NPE.
Raphael [Sun, 20 Dec 2009 18:59:51 +0000 (10:59 -0800)]
am
47e775d0: Merge change Iaadf3b84 into eclair
Merge commit '
47e775d0e695b02f4768be7cda0f2010ee214147' into eclair-plus-aosp
* commit '
47e775d0e695b02f4768be7cda0f2010ee214147':
ADT: Fix potential NPE.
Android (Google) Code Review [Sun, 20 Dec 2009 18:56:16 +0000 (10:56 -0800)]
Merge change Iaadf3b84 into eclair
* changes:
ADT: Fix potential NPE.
Raphael [Sun, 20 Dec 2009 18:50:03 +0000 (10:50 -0800)]
ADT: Fix potential NPE.
Workbench.getActiveWorkbenchWindows() can potentially return null.
That just happened to me when trying to update an SVN project.
Change-Id: Iaadf3b84778f2f556b66fbc94fd8a59c7cb14b3d
Raphael [Sat, 19 Dec 2009 03:51:51 +0000 (19:51 -0800)]
am
a8e87328: am
eb6a30bc: ADT: GLE toggle buttons in configuration composite.
Merge commit '
a8e873280455b549bd470cf3d7544ed4df8aac8b'
* commit '
a8e873280455b549bd470cf3d7544ed4df8aac8b':
ADT: GLE toggle buttons in configuration composite.
Raphael [Sat, 19 Dec 2009 03:49:01 +0000 (19:49 -0800)]
am
eb6a30bc: ADT: GLE toggle buttons in configuration composite.
Merge commit '
eb6a30bc642ce3ea1ebf0e45ec6113ee94391be0' into eclair-plus-aosp
* commit '
eb6a30bc642ce3ea1ebf0e45ec6113ee94391be0':
ADT: GLE toggle buttons in configuration composite.
Raphael [Sat, 19 Dec 2009 00:27:47 +0000 (16:27 -0800)]
ADT: GLE toggle buttons in configuration composite.
New GLE2 toggles:
- explode view
- show borders
Change-Id: I638b1d4591bee4729be7b4dff753cb166b3eaa61
Raphael [Sat, 19 Dec 2009 01:27:47 +0000 (17:27 -0800)]
am
0e079968: am
b383bbd8: ADT-Tests: Create a suite for the Groovy test.
Merge commit '
0e0799689f0ac8e25ee8095e735bcc3813460880'
* commit '
0e0799689f0ac8e25ee8095e735bcc3813460880':
ADT-Tests: Create a suite for the Groovy test.
Raphael [Sat, 19 Dec 2009 01:25:28 +0000 (17:25 -0800)]
am
b383bbd8: ADT-Tests: Create a suite for the Groovy test.
Merge commit '
b383bbd83c712d8ccb43df057d9c5c0deeb07629' into eclair-plus-aosp
* commit '
b383bbd83c712d8ccb43df057d9c5c0deeb07629':
ADT-Tests: Create a suite for the Groovy test.
Raphael [Sat, 19 Dec 2009 00:50:56 +0000 (16:50 -0800)]
ADT-Tests: Create a suite for the Groovy test.
This is a "feasibility" test, to make sure the groovy
stuff works in the context of the plugin and correctly
gets its files from the JAR.
Change-Id: Ic2a784a2c30848c1919c3530debcbc5633a0b3bf
Raphael [Sat, 19 Dec 2009 00:07:53 +0000 (16:07 -0800)]
am
39111bbe: am
d6be297b: Merge change I2c1b68ce into eclair
Merge commit '
39111bbe906e41efa82194a5e9aaa4f713a632bf'
* commit '
39111bbe906e41efa82194a5e9aaa4f713a632bf':
ADT: Refactor GLE1 and GLE2 classes in their own package.
Raphael [Sat, 19 Dec 2009 00:06:23 +0000 (16:06 -0800)]
am
d6be297b: Merge change I2c1b68ce into eclair
Merge commit '
d6be297b37453bec1120c7f398f3e22554440446' into eclair-plus-aosp
* commit '
d6be297b37453bec1120c7f398f3e22554440446':
ADT: Refactor GLE1 and GLE2 classes in their own package.
Android (Google) Code Review [Sat, 19 Dec 2009 00:02:01 +0000 (16:02 -0800)]
Merge change I2c1b68ce into eclair
* changes:
ADT: Refactor GLE1 and GLE2 classes in their own package.
Raphael [Fri, 18 Dec 2009 23:48:08 +0000 (15:48 -0800)]
ADT: Refactor GLE1 and GLE2 classes in their own package.
This means we have to change a couple classes to public
instead of package protected. However it makes it easier to
read the project and see what files we'll want to deprecate
with GLE1.
Change-Id: I2c1b68ce27773253473cbef5bcef085f9eecfafe
Raphael [Fri, 18 Dec 2009 23:21:44 +0000 (15:21 -0800)]
am
661eb234: am
93041be2: Merge change Idcb3586e into eclair
Merge commit '
661eb234e89da8d0a1eeb89a01d947c67759e7fc'
* commit '
661eb234e89da8d0a1eeb89a01d947c67759e7fc':
Groovy test for ADT-tests.
Raphael [Fri, 18 Dec 2009 23:17:47 +0000 (15:17 -0800)]
am
93041be2: Merge change Idcb3586e into eclair
Merge commit '
93041be29b3e8cf9697cb75e99aa4dc894f43fd0' into eclair-plus-aosp
* commit '
93041be29b3e8cf9697cb75e99aa4dc894f43fd0':
Groovy test for ADT-tests.
Android (Google) Code Review [Fri, 18 Dec 2009 23:10:28 +0000 (15:10 -0800)]
Merge change Idcb3586e into eclair
* changes:
Groovy test for ADT-tests.
Raphael [Thu, 17 Dec 2009 02:35:48 +0000 (18:35 -0800)]
Groovy test for ADT-tests.
Change-Id: Idcb3586e62fbc85f008627dc323f40dba12e8121
Android (Google) Code Review [Thu, 17 Dec 2009 21:32:15 +0000 (13:32 -0800)]
Merge change Ib93126c7
* changes:
Correctly read HierarchyViewer's protocol in UTF-8. Bug:
1739385.
Romain Guy [Thu, 17 Dec 2009 21:30:34 +0000 (13:30 -0800)]
Correctly read HierarchyViewer's protocol in UTF-8.
Bug:
1739385.
Xavier Ducrohet [Wed, 16 Dec 2009 23:52:45 +0000 (15:52 -0800)]
am
db1773ef: am
9e2ff906: Prevent project from building before their target data has been loaded.
Merge commit '
db1773ef64e9529b09606c6032c271dbd940921b'
* commit '
db1773ef64e9529b09606c6032c271dbd940921b':
Prevent project from building before their target data has been loaded.
Xavier Ducrohet [Wed, 16 Dec 2009 23:52:37 +0000 (15:52 -0800)]
am
fe13f3d0: am
62ff6d73: Add support for manually uninstalled apk in the launcher
Merge commit '
fe13f3d01651c436fdb3c2d0b6ffc96ce9d68941'
* commit '
fe13f3d01651c436fdb3c2d0b6ffc96ce9d68941':
Add support for manually uninstalled apk in the launcher
Xavier Ducrohet [Wed, 16 Dec 2009 23:47:02 +0000 (15:47 -0800)]
am
9e2ff906: Prevent project from building before their target data has been loaded.
Merge commit '
9e2ff90642669592f832d9f1cb56cc6871d5aaab' into eclair-plus-aosp
* commit '
9e2ff90642669592f832d9f1cb56cc6871d5aaab':
Prevent project from building before their target data has been loaded.
Xavier Ducrohet [Wed, 16 Dec 2009 01:10:13 +0000 (17:10 -0800)]
Prevent project from building before their target data has been loaded.
Projects that attempts to build before their target data has been loaded
are put in a list of project to be recompile upon load completion.
Bug:
2303254
Change-Id: Iad9a652ac5455432b2616334bcc8536e169c2adb
Xavier Ducrohet [Wed, 16 Dec 2009 23:34:58 +0000 (15:34 -0800)]
am
62ff6d73: Add support for manually uninstalled apk in the launcher
Merge commit '
62ff6d73be0f7bbc72eb3e23b02a0b4597144a56' into eclair-plus-aosp
* commit '
62ff6d73be0f7bbc72eb3e23b02a0b4597144a56':
Add support for manually uninstalled apk in the launcher
Xavier Ducrohet [Wed, 16 Dec 2009 02:54:17 +0000 (18:54 -0800)]
Add support for manually uninstalled apk in the launcher
Bug:
2306782
Change-Id: I45eb8b3e61631c0656fb6c4870c7a1c7542a0bca
Xavier Ducrohet [Wed, 16 Dec 2009 01:17:28 +0000 (17:17 -0800)]
am
259ced0b: am
605d6192: Link the "force error on native lib" preferences to the Apkbuilder.
Merge commit '
259ced0bb008ea9a8d0f62c192813b109e8d2b8a'
* commit '
259ced0bb008ea9a8d0f62c192813b109e8d2b8a':
Link the "force error on native lib" preferences to the Apkbuilder.
Xavier Ducrohet [Wed, 16 Dec 2009 01:17:25 +0000 (17:17 -0800)]
Xavier Ducrohet [Wed, 16 Dec 2009 01:13:59 +0000 (17:13 -0800)]
am
605d6192: Link the "force error on native lib" preferences to the Apkbuilder.
Merge commit '
605d61926160af815b113fb98434f3e32cf7d73f' into eclair-plus-aosp
* commit '
605d61926160af815b113fb98434f3e32cf7d73f':
Link the "force error on native lib" preferences to the Apkbuilder.
Xavier Ducrohet [Wed, 16 Dec 2009 01:13:55 +0000 (17:13 -0800)]
am
9a68767a: Cleaned up Markers in ADT.
Merge commit '
9a68767a27170689fd647276cb0b082d192448fd' into eclair-plus-aosp
* commit '
9a68767a27170689fd647276cb0b082d192448fd':
Cleaned up Markers in ADT.
Xavier Ducrohet [Tue, 15 Dec 2009 23:22:06 +0000 (15:22 -0800)]
Link the "force error on native lib" preferences to the Apkbuilder.
Change-Id: I57a812946586d89a1abef4bff70d11985fcacc0e
Raphael [Tue, 15 Dec 2009 23:05:46 +0000 (15:05 -0800)]
am
dcbd3afc: am
2758c672: Merge change I4d043716 into eclair
Merge commit '
dcbd3afc528f1fb803b64e54590acc73d737ea68'
* commit '
dcbd3afc528f1fb803b64e54590acc73d737ea68':
GLE2: Add groovy.jar to ADT and ADT-tests
Xavier Ducrohet [Tue, 15 Dec 2009 23:03:49 +0000 (15:03 -0800)]
am
c2a2b5da: am
783561a1: Merge change Ibf602fbb into eclair
Merge commit '
c2a2b5da3fa2fc2b43175aa5a599509cb6842e6b'
* commit '
c2a2b5da3fa2fc2b43175aa5a599509cb6842e6b':
Fix the combos in the editors on MacOS to trigger event on selection from list.
Xavier Ducrohet [Tue, 15 Dec 2009 22:41:24 +0000 (14:41 -0800)]
Cleaned up Markers in ADT.
New packaging marker specific to packaging error coming from
ApkBuilder. This prevent conflicts with other builders adding
or removing those same markers (which apparently prevent those
markers from appearing if ApkBuilder sets them.
Fixed some conflicts between different version of
BaseProjectHelper.addMarker. Renamed the method markResource
and markProject to make it clearer.
Change-Id: I53663a052e3014fd0bff1757a9ae3d642133689f
Raphael [Tue, 15 Dec 2009 18:29:17 +0000 (10:29 -0800)]
am
2758c672: Merge change I4d043716 into eclair
Merge commit '
2758c672a9d5bb9ef66e4aed5db1183be28b192c' into eclair-plus-aosp
* commit '
2758c672a9d5bb9ef66e4aed5db1183be28b192c':
GLE2: Add groovy.jar to ADT and ADT-tests
Android (Google) Code Review [Tue, 15 Dec 2009 18:26:08 +0000 (10:26 -0800)]
Merge change I4d043716 into eclair
* changes:
GLE2: Add groovy.jar to ADT and ADT-tests
Xavier Ducrohet [Tue, 15 Dec 2009 15:40:27 +0000 (07:40 -0800)]
am
783561a1: Merge change Ibf602fbb into eclair
Merge commit '
783561a1b4f77305ef37f590a6d0950c1b5c5d8d' into eclair-plus-aosp
* commit '
783561a1b4f77305ef37f590a6d0950c1b5c5d8d':
Fix the combos in the editors on MacOS to trigger event on selection from list.
Android Git Automerger [Tue, 15 Dec 2009 08:45:10 +0000 (00:45 -0800)]
Merge commit 'goog/eclair-plus-aosp'
Romain Guy [Tue, 15 Dec 2009 02:54:11 +0000 (18:54 -0800)]
Handle version 3 of the View server.
Raphael [Fri, 11 Dec 2009 00:50:29 +0000 (16:50 -0800)]
GLE2: Add groovy.jar to ADT and ADT-tests
Change-Id: I4d0437161b582ae23c23606a8bfa16b04ae508c0
Romain Guy [Mon, 14 Dec 2009 23:32:31 +0000 (15:32 -0800)]
Fixes crash in HierarchyViewer when windows hash code exceed int capacity.
Bug:
2321018
Android (Google) Code Review [Mon, 14 Dec 2009 23:02:23 +0000 (15:02 -0800)]
Merge change Ibf602fbb into eclair
* changes:
Fix the combos in the editors on MacOS to trigger event on selection from list.
Xavier Ducrohet [Mon, 14 Dec 2009 22:48:31 +0000 (14:48 -0800)]
Fix the combos in the editors on MacOS to trigger event on selection from list.
BUG:
2323805
Change-Id: Ibf602fbb92da548254051c15e16526348788d56a
Raphael [Sun, 13 Dec 2009 20:41:11 +0000 (12:41 -0800)]
am
023c25de: am
f12e7eb7: am
b8cc9f36: Fix ADT Tests (see Change If49c1e1a)
Merge commit '
023c25de5f7dbf0b2286b03be78f0f34238d590e'
* commit '
023c25de5f7dbf0b2286b03be78f0f34238d590e':
Fix ADT Tests (see Change If49c1e1a)
Xavier Ducrohet [Sun, 13 Dec 2009 20:41:07 +0000 (12:41 -0800)]
Raphael [Sun, 13 Dec 2009 20:33:49 +0000 (12:33 -0800)]
am
f12e7eb7: am
b8cc9f36: Fix ADT Tests (see Change If49c1e1a)
Merge commit '
f12e7eb7df6f5ef3135a969ad77682a5dbe24329' into eclair-mr2-plus-aosp
* commit '
f12e7eb7df6f5ef3135a969ad77682a5dbe24329':
Fix ADT Tests (see Change If49c1e1a)
Xavier Ducrohet [Sun, 13 Dec 2009 20:33:43 +0000 (12:33 -0800)]
am
5426e998: am
0335802d: Merge change If49c1e1a into eclair
Merge commit '
5426e9986c166b001a5d4d4407d7fa70b6c50f79' into eclair-mr2-plus-aosp
* commit '
5426e9986c166b001a5d4d4407d7fa70b6c50f79':
Exploded view rendering.
Raphael [Sun, 13 Dec 2009 20:26:15 +0000 (12:26 -0800)]
am
b8cc9f36: Fix ADT Tests (see Change If49c1e1a)
Merge commit '
b8cc9f3659c467afb6da36e11a9cda2c57479e0b' into eclair-mr2
* commit '
b8cc9f3659c467afb6da36e11a9cda2c57479e0b':
Fix ADT Tests (see Change If49c1e1a)
Xavier Ducrohet [Sun, 13 Dec 2009 20:24:35 +0000 (12:24 -0800)]
am
0335802d: Merge change If49c1e1a into eclair
Merge commit '
0335802d77e3eb36ab9aa07946d66d6dd8e309d4' into eclair-mr2
* commit '
0335802d77e3eb36ab9aa07946d66d6dd8e309d4':
Exploded view rendering.
Raphael [Sat, 12 Dec 2009 23:53:21 +0000 (15:53 -0800)]
am
b8cc9f36: Fix ADT Tests (see Change If49c1e1a)
Merge commit '
b8cc9f3659c467afb6da36e11a9cda2c57479e0b' into eclair-plus-aosp
* commit '
b8cc9f3659c467afb6da36e11a9cda2c57479e0b':
Fix ADT Tests (see Change If49c1e1a)
Raphael [Sat, 12 Dec 2009 05:33:24 +0000 (21:33 -0800)]
Fix ADT Tests (see Change If49c1e1a)
Change-Id: Ief3c7bf7fddc6a91fb1c00b5cffcc7778b12815b
Xavier Ducrohet [Fri, 11 Dec 2009 23:25:00 +0000 (15:25 -0800)]
am
0335802d: Merge change If49c1e1a into eclair
Merge commit '
0335802d77e3eb36ab9aa07946d66d6dd8e309d4' into eclair-plus-aosp
* commit '
0335802d77e3eb36ab9aa07946d66d6dd8e309d4':
Exploded view rendering.
Android (Google) Code Review [Fri, 11 Dec 2009 23:20:51 +0000 (15:20 -0800)]
Merge change If49c1e1a into eclair
* changes:
Exploded view rendering.
Xavier Ducrohet [Fri, 11 Dec 2009 03:48:39 +0000 (19:48 -0800)]
Exploded view rendering.
- Override padding values on layout when sent to the layoutlib rendering.
Either set a 10px padding, or add 10px to the current padding (resolving
values in dip, sp, pt, in, mm)
- Screen size is increased to match the new padding. this is a work
in progress and a lot of logic for each layout still needs to be done
- Display a white outline for the exploded layouts in the GLE1.
GLE2 support to come.
All of this is currently on the same toggle as the clipped rendering.
Need to add a new toggle button for it (and map it to a key shortcut)
Change-Id: If49c1e1a07923aeeca9dbc76f978afff2d106b51
Xavier Ducrohet [Fri, 11 Dec 2009 20:21:57 +0000 (12:21 -0800)]
am
9792d6b3: am
e3be459d: am
a6264bb6: Merge change I772404ad into eclair
Merge commit '
9792d6b37f63e3fd4071867ddb4e34aef4927258'
* commit '
9792d6b37f63e3fd4071867ddb4e34aef4927258':
Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.
Xavier Ducrohet [Fri, 11 Dec 2009 20:18:32 +0000 (12:18 -0800)]
am
e3be459d: am
a6264bb6: Merge change I772404ad into eclair
Merge commit '
e3be459db85a46699d5ce2229b2e4af6d6a92ae9' into eclair-mr2-plus-aosp
* commit '
e3be459db85a46699d5ce2229b2e4af6d6a92ae9':
Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.
Xavier Ducrohet [Fri, 11 Dec 2009 20:16:47 +0000 (12:16 -0800)]
am
a6264bb6: Merge change I772404ad into eclair
Merge commit '
a6264bb62807e0135319336636a2e7516ab96d7a' into eclair-mr2
* commit '
a6264bb62807e0135319336636a2e7516ab96d7a':
Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.
Xavier Ducrohet [Fri, 11 Dec 2009 20:16:09 +0000 (12:16 -0800)]
am
a6264bb6: Merge change I772404ad into eclair
Merge commit '
a6264bb62807e0135319336636a2e7516ab96d7a' into eclair-plus-aosp
* commit '
a6264bb62807e0135319336636a2e7516ab96d7a':
Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.