OSDN Git Service
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 [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: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 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: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: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
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: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
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: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 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: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: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: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: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
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: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
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.
Raphael [Fri, 11 Dec 2009 00:50:29 +0000 (16:50 -0800)]
GLE2: Add groovy.jar to ADT and ADT-tests
Change-Id: I4d0437161b582ae23c23606a8bfa16b04ae508c0
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 [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: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.
Android (Google) Code Review [Fri, 11 Dec 2009 20:12:07 +0000 (12:12 -0800)]
Merge change I772404ad into eclair
* changes:
Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.
Xavier Ducrohet [Fri, 11 Dec 2009 19:21:44 +0000 (11:21 -0800)]
Fix in ADT prefs: make sure unrecognized build verbosity values don't crash ADT.
Change-Id: I772404ad500462da94ba243ebc4f7c26ea2a267a
Romain Guy [Fri, 11 Dec 2009 02:53:37 +0000 (18:53 -0800)]
am
eee8b435: Merge change Ib350e6de into eclair
Merge commit '
eee8b435e8f79af82b31a67ff72b327d15fa9391' into eclair-plus-aosp
* commit '
eee8b435e8f79af82b31a67ff72b327d15fa9391':
Fix layoutopt.bat to start layoutopt on Windows.
Android (Google) Code Review [Fri, 11 Dec 2009 02:49:14 +0000 (18:49 -0800)]
Merge change Ib350e6de into eclair
* changes:
Fix layoutopt.bat to start layoutopt on Windows.
Romain Guy [Fri, 11 Dec 2009 02:35:48 +0000 (18:35 -0800)]
Fix layoutopt.bat to start layoutopt on Windows.
Xavier Ducrohet [Thu, 10 Dec 2009 23:43:38 +0000 (15:43 -0800)]
am
2a4cdf02: Merge change I21c4911e into eclair
Merge commit '
2a4cdf0279367f510ac555cbef60f14aa9d1f4a3' into eclair-plus-aosp
* commit '
2a4cdf0279367f510ac555cbef60f14aa9d1f4a3':
Update builder to check for native libs in 3rd party jar.
Android (Google) Code Review [Thu, 10 Dec 2009 23:39:29 +0000 (15:39 -0800)]
Merge change I21c4911e into eclair
* changes:
Update builder to check for native libs in 3rd party jar.
Xavier Ducrohet [Thu, 10 Dec 2009 23:01:16 +0000 (15:01 -0800)]
Update builder to check for native libs in 3rd party jar.
- Apkbuilder now look for .jnilib / .so libs in 3rd party jars files
and complain if any are found
- preferences to set error/warning on libraries that don't interfer with
NDK native lib path
- refactoring of the Preferences into AdtPrefs as too much was getting
in AdtPlugin. Merged the PreferenceInitializer into AdtPrefs.
- merged AdtConstants and AndroidConstants, as there were remnants of
the common/adt/editor merge.
- Looks like there are issues with some markers. I did some changes
but I'll clean it up in the next commit.
BUG
2242132
Change-Id: I21c4911e9c8bd32fcff17a7788b37d920b7acbf5
Xavier Ducrohet [Thu, 10 Dec 2009 03:41:28 +0000 (19:41 -0800)]
am
85324345: Merge change I8ce7b882 into eclair
Merge commit '
85324345145c50f9540b3e908236b10a1eb10cca' into eclair-plus-aosp
* commit '
85324345145c50f9540b3e908236b10a1eb10cca':
Update the Eclipse plug-in change files with new updates.
Android (Google) Code Review [Thu, 10 Dec 2009 03:39:49 +0000 (19:39 -0800)]
Merge change I8ce7b882 into eclair
* changes:
Update the Eclipse plug-in change files with new updates.
Xavier Ducrohet [Wed, 9 Dec 2009 00:05:19 +0000 (16:05 -0800)]
Update the Eclipse plug-in change files with new updates.
Change-Id: I8ce7b882fd72b9d3d517210cafeef5d9dadbf33c
Xavier Ducrohet [Wed, 9 Dec 2009 19:21:56 +0000 (11:21 -0800)]
am
1d6f06b4: Add the allocation tracker to the DDMS plug-in.
Merge commit '
1d6f06b48e5a5f04669e8f7c2be66a8e1b19aa99' into eclair-plus-aosp
* commit '
1d6f06b48e5a5f04669e8f7c2be66a8e1b19aa99':
Add the allocation tracker to the DDMS plug-in.
Xavier Ducrohet [Tue, 8 Dec 2009 23:27:43 +0000 (15:27 -0800)]
Add the allocation tracker to the DDMS plug-in.
Change-Id: I294d92046fccdba71ba1b2ab4280014a7722e65e
Xavier Ducrohet [Tue, 8 Dec 2009 22:11:26 +0000 (14:11 -0800)]
am
5e8170ac: Merge change I3cc4f3fe into eclair
Merge commit '
5e8170aca82ca20f3c4bb937ef3ef00387bfb131' into eclair-plus-aosp
* commit '
5e8170aca82ca20f3c4bb937ef3ef00387bfb131':
Properly order targets.
Android (Google) Code Review [Tue, 8 Dec 2009 22:08:31 +0000 (14:08 -0800)]
Merge change I3cc4f3fe into eclair
* changes:
Properly order targets.
Raphael [Tue, 8 Dec 2009 21:59:51 +0000 (13:59 -0800)]
am
06b7bf8f: ADT GLE2: Implement Edit > Select All.
Merge commit '
06b7bf8f958e08d3d459720d5a353b29e51de1c6' into eclair-plus-aosp
* commit '
06b7bf8f958e08d3d459720d5a353b29e51de1c6':
ADT GLE2: Implement Edit > Select All.
Xavier Ducrohet [Tue, 8 Dec 2009 21:52:19 +0000 (13:52 -0800)]
Properly order targets.
Change-Id: I3cc4f3fe39715750b72a89a28b682eb16c3a8c27
Raphael [Tue, 8 Dec 2009 21:17:15 +0000 (13:17 -0800)]
ADT GLE2: Implement Edit > Select All.
Also wires copy/paste/cut even though they are not used yet.
Change-Id: I265566bd5f4a612f03e9919bd34d47869006b7b6
Xavier Ducrohet [Tue, 8 Dec 2009 21:39:31 +0000 (13:39 -0800)]
am
75689a36: Merge change Iba88d526 into eclair
Merge commit '
75689a36371c763cc0bdb4d51f9f7cf419592493' into eclair-plus-aosp
* commit '
75689a36371c763cc0bdb4d51f9f7cf419592493':
Load the SDK target data dynamically when a project requires it.
Android (Google) Code Review [Tue, 8 Dec 2009 21:36:06 +0000 (13:36 -0800)]
Merge change Iba88d526 into eclair
* changes:
Load the SDK target data dynamically when a project requires it.
Xavier Ducrohet [Tue, 8 Dec 2009 02:41:34 +0000 (18:41 -0800)]
Load the SDK target data dynamically when a project requires it.
BUG
2303254
Change-Id: Iba88d526f50218bb57c41109ca1777bad441bb00
Raphael [Tue, 8 Dec 2009 00:19:43 +0000 (16:19 -0800)]
am
c2a2cf85: Merge change Ic07e0d19 into eclair
Merge commit '
c2a2cf85f8a887e655f710e9bcd84d6e22d1e209' into eclair-plus-aosp
* commit '
c2a2cf85f8a887e655f710e9bcd84d6e22d1e209':
GLE2: fix group toggle & scrollbar in layout palette.
Android (Google) Code Review [Tue, 8 Dec 2009 00:16:46 +0000 (16:16 -0800)]
Merge change Ic07e0d19 into eclair
* changes:
GLE2: fix group toggle & scrollbar in layout palette.
Raphael [Mon, 7 Dec 2009 22:40:55 +0000 (14:40 -0800)]
GLE2: fix group toggle & scrollbar in layout palette.
Change-Id: Ic07e0d19b21434c5f9bf7c0149d1f402e1e5a1bd
Xavier Ducrohet [Mon, 7 Dec 2009 19:13:26 +0000 (11:13 -0800)]
am
977214b9: Merge change Iaf2904b2 into eclair
Merge commit '
977214b91d3c58ebddc55f4ac8efda1d7de01a0f' into eclair-plus-aosp
* commit '
977214b91d3c58ebddc55f4ac8efda1d7de01a0f':
AVD Selector now sort AVDs
Android (Google) Code Review [Mon, 7 Dec 2009 19:09:36 +0000 (11:09 -0800)]
Merge change Iaf2904b2 into eclair
* changes:
AVD Selector now sort AVDs
Xavier Ducrohet [Sat, 5 Dec 2009 03:21:51 +0000 (19:21 -0800)]
am
a5f61032: Merge change Ia935511f into eclair
Merge commit '
a5f61032390c119fab92e87196ba4680cfc42ee5' into eclair-plus-aosp
* commit '
a5f61032390c119fab92e87196ba4680cfc42ee5':
Update ADT's changes.txt file.
Android (Google) Code Review [Sat, 5 Dec 2009 03:19:16 +0000 (19:19 -0800)]
Merge change Ia935511f into eclair
* changes:
Update ADT's changes.txt file.
Xavier Ducrohet [Sat, 5 Dec 2009 03:17:25 +0000 (19:17 -0800)]
am
33b62060: Listen to default.properties change from outside of ADT and update the project.
Merge commit '
33b62060beacbdf05ebbbfbb15b90365f005081f' into eclair-plus-aosp
* commit '
33b62060beacbdf05ebbbfbb15b90365f005081f':
Listen to default.properties change from outside of ADT and update the project.
Xavier Ducrohet [Sat, 5 Dec 2009 01:55:30 +0000 (17:55 -0800)]
Update ADT's changes.txt file.
Xavier Ducrohet [Sat, 5 Dec 2009 03:07:02 +0000 (19:07 -0800)]
AVD Selector now sort AVDs
Also fixed the IAndroidTarget comparison to sort first by revision
and then per platform or addon and then per vendor/name (for add-ons)
BUG
2302823
Xavier Ducrohet [Sat, 5 Dec 2009 01:33:21 +0000 (17:33 -0800)]
Listen to default.properties change from outside of ADT and update the project.
BUG
2287591
Xavier Ducrohet [Sat, 5 Dec 2009 00:28:51 +0000 (16:28 -0800)]
am
4e278588: Make the SDK stat opt-out dialog not interfer with other modal dialogs.
Merge commit '
4e278588e789280a94e84215813a0e0ec4fe75fd' into eclair-plus-aosp
* commit '
4e278588e789280a94e84215813a0e0ec4fe75fd':
Make the SDK stat opt-out dialog not interfer with other modal dialogs.
Xavier Ducrohet [Fri, 4 Dec 2009 22:47:40 +0000 (14:47 -0800)]
Make the SDK stat opt-out dialog not interfer with other modal dialogs.
BUG
2305986
Xavier Ducrohet [Fri, 4 Dec 2009 02:20:23 +0000 (18:20 -0800)]
am
178b6d4a: Add a new device to devices.xml for the Layout Editor.
Merge commit '
178b6d4a5600300dd31b9bfd9f98cd4e959c6544' into eclair-plus-aosp
* commit '
178b6d4a5600300dd31b9bfd9f98cd4e959c6544':
Add a new device to devices.xml for the Layout Editor.
Xavier Ducrohet [Thu, 3 Dec 2009 22:54:32 +0000 (14:54 -0800)]
Add a new device to devices.xml for the Layout Editor.
BUG
2296284
Xavier Ducrohet [Thu, 3 Dec 2009 19:53:15 +0000 (11:53 -0800)]
am
9f68a08a: Remove files that have been moved into development.git
Merge commit '
9f68a08a1d6a740e26f02e339a67c166cc83f1db' into eclair-plus-aosp
* commit '
9f68a08a1d6a740e26f02e339a67c166cc83f1db':
Remove files that have been moved into development.git
Xavier Ducrohet [Thu, 3 Dec 2009 03:10:44 +0000 (19:10 -0800)]
Remove files that have been moved into development.git
Xavier Ducrohet [Wed, 2 Dec 2009 21:49:43 +0000 (13:49 -0800)]
am
40134607: Merge change I79854c45 into eclair
Merge commit '
4013460709a66ea2cb1816faa99b3700f4760264' into eclair-plus-aosp
* commit '
4013460709a66ea2cb1816faa99b3700f4760264':
Enforce 9+ MB sdcard size when creating AVDs.
Android (Google) Code Review [Wed, 2 Dec 2009 21:44:59 +0000 (13:44 -0800)]
Merge change I79854c45 into eclair
* changes:
Enforce 9+ MB sdcard size when creating AVDs.
Xavier Ducrohet [Wed, 2 Dec 2009 21:01:51 +0000 (13:01 -0800)]
Enforce 9+ MB sdcard size when creating AVDs.
BUG
2296337
Xavier Ducrohet [Wed, 2 Dec 2009 21:02:46 +0000 (13:02 -0800)]
am
5acbc909: Merge change Iaa970a49 into eclair
Merge commit '
5acbc90908dab4ac981c5a1e9577cb16c03fd394' into eclair-plus-aosp
* commit '
5acbc90908dab4ac981c5a1e9577cb16c03fd394':
Clean up the content of scripts/ folder.
Android (Google) Code Review [Wed, 2 Dec 2009 20:59:44 +0000 (12:59 -0800)]
Merge change Iaa970a49 into eclair
* changes:
Clean up the content of scripts/ folder.