OSDN Git Service
Xavier Ducrohet [Sat, 9 Jan 2010 00:24:55 +0000 (16:24 -0800)]
ADT/GLE: Fix config selector to not select a config that has a better match than the current file.
When replacing a file with another one (because of a user "open action")
it is possible the config selector will find the current config compatible,
even though the previous layout was a better for match for it.
The config selector now attemps to find a config for which the new
file is the best match.
Change-Id: I7d794c2a8b9a90a120970049cb402f9ee84f8749
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 [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 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 [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 [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 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: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: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 [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 [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
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 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 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
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
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 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 02:54:17 +0000 (18:54 -0800)]
Add support for manually uninstalled apk in the launcher
Bug:
2306782
Change-Id: I45eb8b3e61631c0656fb6c4870c7a1c7542a0bca
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
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
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 05:33:24 +0000 (21:33 -0800)]
Fix ADT Tests (see Change If49c1e1a)
Change-Id: Ief3c7bf7fddc6a91fb1c00b5cffcc7778b12815b
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
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
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.
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
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 [Tue, 8 Dec 2009 23:27:43 +0000 (15:27 -0800)]
Add the allocation tracker to the DDMS plug-in.
Change-Id: I294d92046fccdba71ba1b2ab4280014a7722e65e
Android (Google) Code Review [Tue, 8 Dec 2009 22:08:31 +0000 (14:08 -0800)]
Merge change I3cc4f3fe into eclair
* changes:
Properly order targets.
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
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
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
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
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 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 [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 [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 03:10:44 +0000 (19:10 -0800)]
Remove files that have been moved into development.git
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
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.
Xavier Ducrohet [Tue, 1 Dec 2009 22:40:42 +0000 (14:40 -0800)]
Fix a possible NPE when add-ons don't have optional APIs.
BUG
2235023
Xavier Ducrohet [Tue, 1 Dec 2009 21:02:31 +0000 (13:02 -0800)]
Clean up the content of scripts/ folder.
- move back some scripts into development/scripts/
- templates for Ant project go in sdk/templates/
- files that are packaged with the sdk go in sdk/files/
Raphael [Mon, 30 Nov 2009 19:07:45 +0000 (11:07 -0800)]
ADT GLE2: palette view with drag'n'drop source.
Work in progress.
Raphael [Fri, 20 Nov 2009 21:19:15 +0000 (13:19 -0800)]
am
109964b3: ADT fix: layout device config files can be empty (no devices)
Merge commit '
109964b3c9b274d5c69f10114dff6917b597365b' into eclair
* commit '
109964b3c9b274d5c69f10114dff6917b597365b':
ADT fix: layout device config files can be empty (no devices)
Raphael [Fri, 20 Nov 2009 20:46:08 +0000 (12:46 -0800)]
ADT fix: layout device config files can be empty (no devices)
SDK BUG
2275276
Change-Id: I139f3b16a258a8e1b223b62d9c93e9870b6fb27c
Xavier Ducrohet [Fri, 20 Nov 2009 00:42:33 +0000 (16:42 -0800)]
Update doc/platform source.prop to match 2.1/7
Android (Google) Code Review [Thu, 19 Nov 2009 19:46:00 +0000 (11:46 -0800)]
Merge change I2b17d396 into eclair
* changes:
More ADT to 0.9.6
Xavier Ducrohet [Thu, 19 Nov 2009 19:28:42 +0000 (11:28 -0800)]
More ADT to 0.9.6
Raphael [Thu, 19 Nov 2009 18:55:36 +0000 (10:55 -0800)]
am
4b38ad89: SDK Manager: sort packages from remote repositories.
Merge commit '
4b38ad894bdc56b21c0d7c2a169df49a8c4898b6' into eclair
* commit '
4b38ad894bdc56b21c0d7c2a169df49a8c4898b6':
SDK Manager: sort packages from remote repositories.
Raphael [Thu, 19 Nov 2009 18:50:56 +0000 (10:50 -0800)]
am
534c38a2: Merge change I919980d2 into eclair-sdk
Merge commit '
534c38a2033a1702ab5d41edd62aab3d4e6eb27a' into eclair
* commit '
534c38a2033a1702ab5d41edd62aab3d4e6eb27a':
Display a message in the SDK Manager when a new schema tool is available.
Xavier Ducrohet [Thu, 19 Nov 2009 18:49:24 +0000 (10:49 -0800)]
am
ca6bb022: (-s ours) Merge change Ie805d2fa into eclair-sdk
Merge commit '
ca6bb0220e3823f81ee9493a19bd0ad49a404dc3' into eclair
* commit '
ca6bb0220e3823f81ee9493a19bd0ad49a404dc3':
Move Eclipse plug-ins to 0.9.5 (do not merge)
Raphael [Thu, 19 Nov 2009 06:34:49 +0000 (22:34 -0800)]
SDK Manager: sort packages from remote repositories.
SDK BUG
2271987
Android (Google) Code Review [Thu, 19 Nov 2009 18:42:59 +0000 (10:42 -0800)]
Merge change I919980d2 into eclair-sdk
* changes:
Display a message in the SDK Manager when a new schema tool is available.
Android (Google) Code Review [Thu, 19 Nov 2009 18:40:53 +0000 (10:40 -0800)]
Merge change Ie805d2fa into eclair-sdk
* changes:
Move Eclipse plug-ins to 0.9.5 (do not merge)
Xavier Ducrohet [Tue, 17 Nov 2009 23:38:04 +0000 (15:38 -0800)]
Move Eclipse plug-ins to 0.9.5 (do not merge)
Raphael [Thu, 19 Nov 2009 02:10:46 +0000 (18:10 -0800)]
Display a message in the SDK Manager when a new schema tool is available.
SDK BUG
2252825
Raphael [Thu, 19 Nov 2009 01:12:02 +0000 (17:12 -0800)]
am
f1d64e29: Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
Merge commit '
f1d64e2975451e3bbbcd2e62a03a717308db500a' into eclair
* commit '
f1d64e2975451e3bbbcd2e62a03a717308db500a':
Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
Xavier Ducrohet [Thu, 19 Nov 2009 00:49:34 +0000 (16:49 -0800)]
am
d8ef7816: Remove sdk_clean.sh (moved to development/build/tools)
Merge commit '
d8ef7816f0ffafc6bcf1370ce70b5497e7587230' into eclair
* commit '
d8ef7816f0ffafc6bcf1370ce70b5497e7587230':
Remove sdk_clean.sh (moved to development/build/tools)
Raphael [Wed, 18 Nov 2009 19:27:35 +0000 (11:27 -0800)]
Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
Xavier Ducrohet [Tue, 17 Nov 2009 23:10:15 +0000 (15:10 -0800)]
Remove sdk_clean.sh (moved to development/build/tools)
Android (Google) Code Review [Tue, 17 Nov 2009 03:39:13 +0000 (19:39 -0800)]
Merge change I6809bd44 into eclair
* changes:
SDK Manager: XML Schema for sdk-repository v2
Raphael [Tue, 17 Nov 2009 02:00:59 +0000 (18:00 -0800)]
SDK Manager: XML Schema for sdk-repository v2
v2 will be a full standalone schema, not reusing any parts of v1.
Each package type is now defined using a named type, which means
a v3 version would redifine the top element and could include
some named types of v2.
Unfortunately we cannot *extend* the top element from v1 because
extension in XML Schema seems to imply a sequence (i.e. fixed order)
whereas we use a "choice" mode to have 0..N of each types in any
order.
SDK BUG
2252825
Change-Id: I6809bd4486ef2d7f2473995ed5a0abb7fa377bdd
Android (Google) Code Review [Mon, 16 Nov 2009 22:53:57 +0000 (14:53 -0800)]
Merge change I8d8b5816 into eclair
* changes:
Update build-toolchain.sh to be able to build gcc 4.4.0
Android (Google) Code Review [Mon, 16 Nov 2009 22:53:45 +0000 (14:53 -0800)]
Merge change If72f81fb into eclair
* changes:
Add a script to download and package the toolchain sources.
Raphael [Mon, 16 Nov 2009 22:25:49 +0000 (14:25 -0800)]
am
f4c63fae: SDK Manager support for future schemas.
Merge commit '
f4c63fae0c6d0654ab49e05b3292e218f82f97d8' into eclair
* commit '
f4c63fae0c6d0654ab49e05b3292e218f82f97d8':
SDK Manager support for future schemas.
Raphael [Mon, 16 Nov 2009 21:51:15 +0000 (13:51 -0800)]
SDK Manager support for future schemas.
This CL cleans up the v2 test by removing all v2 stuff
from the code right now. We only keep the part that
handles future schemas and right now the latest version is 1.
Change-Id: I31e6aeaf0582e94c67e1cc8317bec479ea7a52e7
Raphael [Mon, 16 Nov 2009 21:06:54 +0000 (13:06 -0800)]
resolved conflicts for merge of
0da4f158 to eclair
Fixes a merge eclair-sdk => eclair conflict of
SDK Manager: phase 1 of support for future schemas
SDK BUG
2252825
Change-Id: I7530bdb7315439416abad114ef59208f8d4b3ab8
Android (Google) Code Review [Mon, 16 Nov 2009 20:53:09 +0000 (12:53 -0800)]
Merge change If1bda264 into eclair-sdk
* changes:
SDK Manager: phase 1 of support for future schemas
Xavier Ducrohet [Mon, 16 Nov 2009 20:50:17 +0000 (12:50 -0800)]
am
b624370d: (-s ours) Rename the layout device from ION to ADP2. (do not merge)
Merge commit '
b624370d795cd1e17fcd9960c98c01463c23757f' into eclair
* commit '
b624370d795cd1e17fcd9960c98c01463c23757f':
Rename the layout device from ION to ADP2. (do not merge)
David 'Digit' Turner [Mon, 16 Nov 2009 19:39:52 +0000 (11:39 -0800)]
Update build-toolchain.sh to be able to build gcc 4.4.0
Update the script used to build the prebuilt toolchain binaries.
There are now two ways to use it:
1/ As usual, just invoke it and it will download the source tarball,
uncompress it, configure the toolchain sources, build them, then
package the result into a 'prebuilt' tarball.
2/ Generate a new source tarball with the 'download-toolchain-sources.sh'
script, and invoke build-toolchain.sh with the --package=<tarball>
option.
Additionally, you can now specify --gcc-version=4.4.0 to build GCC 4.4.0
(with ARMv7 / FPU support)
The option --gdb-version=6.8 has been added but the build doesn't seem
to work yet. This will probably be fixed in the toolchain git repository
though.
This will be used to refresh the NDK with gcc 4.4.0 prebuilts and support
for armeabi-v7a soon.
Raphael [Sun, 15 Nov 2009 05:30:27 +0000 (21:30 -0800)]
SDK Manager: phase 1 of support for future schemas
This is phase 1 of the support for future schemas:
- introduces a new v2 of the XSD
- handles an unknown XSD and extract its tools elements after
some hand checks.
TODO in phase 2:
- we still need to iron out the details of the sample node.
- there's no support for samples yet... this commit is not
about switching the sample code support to the new structure.
- there's no indication to the user that we are handling a new
schema... there should be some visual clue on why only the
tools are shown.
SDK BUG
2252825
Change-Id: If1bda26414cfe15275063d3187a98be6301d2992
David 'Digit' Turner [Mon, 16 Nov 2009 19:26:06 +0000 (11:26 -0800)]
Add a script to download and package the toolchain sources.
download-toolchain-sources.sh will download the current toolchain sources
from our git repositories then finely package them into a compressed
tarball that will later be used to rebuild the prebuilt binaries properly.
Due to the way our sources are stored in the git repository, the sources
in the tarball are laid out slightly differently than in the original toolchain
source archive used for NDK 1.6.
An upcoming patch will modify build-toolchain.sh to deal with the difference
and also allow the build of gcc-4.4.0 and gdb-6.8.
Xavier Ducrohet [Mon, 16 Nov 2009 01:02:26 +0000 (17:02 -0800)]
Rename the layout device from ION to ADP2. (do not merge)
This is integrated from Eclair.
Android (Google) Code Review [Mon, 16 Nov 2009 19:21:10 +0000 (11:21 -0800)]
Merge change I5a66bbdf into eclair
* changes:
Rename the layout device from ION to ADP2.
Xavier Ducrohet [Mon, 16 Nov 2009 01:02:26 +0000 (17:02 -0800)]
Rename the layout device from ION to ADP2.
Change-Id: I5a66bbdf68772504cac2379ea85edb88c77f2fde
Android (Google) Code Review [Sun, 15 Nov 2009 21:22:41 +0000 (13:22 -0800)]
Merge change I62823795 into eclair
* changes:
Move source.properties for doc in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 21:16:01 +0000 (13:16 -0800)]
Move source.properties for doc in sync with 2.0.1
Change-Id: I6282379532159de597aaec50cad81b14a0c895ce
Android (Google) Code Review [Sun, 15 Nov 2009 21:14:47 +0000 (13:14 -0800)]
Merge change I229c60a9 into eclair
* changes:
Move source.properties for platform in sync with 2.0.1
Xavier Ducrohet [Sun, 15 Nov 2009 20:52:56 +0000 (12:52 -0800)]
Move source.properties for platform in sync with 2.0.1
Change-Id: I229c60a97138c70bb9b27bd0aa60670b882cb711
Raphael [Sat, 14 Nov 2009 22:39:52 +0000 (14:39 -0800)]
am
d2ad5e31: Merge change I361fb688 into eclair-sdk
Merge commit '
d2ad5e31b829f609c76f2352cbdb964c0a4434e6' into eclair
* commit '
d2ad5e31b829f609c76f2352cbdb964c0a4434e6':
SDK Manager: fix, create temp folder before download