OSDN Git Service
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.
Xavier Ducrohet [Wed, 2 Dec 2009 19:02:49 +0000 (11:02 -0800)]
am
0cf76533: Fix a possible NPE when add-ons don\'t have optional APIs.
Merge commit '
0cf765337d75539a42fb2ff1a635e2ad34c6446e' into eclair-plus-aosp
* commit '
0cf765337d75539a42fb2ff1a635e2ad34c6446e':
Fix a possible NPE when add-ons don't have optional APIs.
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:49:56 +0000 (11:49 -0800)]
am
f200375d: ADT GLE2: palette view with drag\'n\'drop source.
Merge commit '
f200375d590efd084142d60058ce6c9543a1b9cd' into eclair-plus-aosp
* commit '
f200375d590efd084142d60058ce6c9543a1b9cd':
ADT GLE2: palette view with drag'n'drop source.
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:22:07 +0000 (13:22 -0800)]
am
e18bb230: am
109964b3: ADT fix: layout device config files can be empty (no devices)
Merge commit '
e18bb2306ec781713e87e9b4a776254876a87bb2' into eclair-plus-aosp
* commit '
e18bb2306ec781713e87e9b4a776254876a87bb2':
ADT fix: layout device config files can be empty (no devices)
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 19:01:15 +0000 (11:01 -0800)]
am
88ab0ccc: Update doc/platform source.prop to match 2.1/7
Merge commit '
88ab0ccc29326835007c628c79386ced7865dfff' into eclair-plus-aosp
* commit '
88ab0ccc29326835007c628c79386ced7865dfff':
Update doc/platform source.prop to match 2.1/7
Xavier Ducrohet [Fri, 20 Nov 2009 00:42:33 +0000 (16:42 -0800)]
Update doc/platform source.prop to match 2.1/7
Xavier Ducrohet [Thu, 19 Nov 2009 19:47:32 +0000 (11:47 -0800)]
am
7551a21b: Merge change I2b17d396 into eclair
Merge commit '
7551a21b6c4b2b915beba68ba0c2a1c346c65d42' into eclair-plus-aosp
* commit '
7551a21b6c4b2b915beba68ba0c2a1c346c65d42':
More ADT to 0.9.6
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:59:07 +0000 (10:59 -0800)]
am
ad87495e: am
4b38ad89: SDK Manager: sort packages from remote repositories.
Merge commit '
ad87495ec1634e7d7f0204958c0f81b7846c0f5b' into eclair-plus-aosp
* commit '
ad87495ec1634e7d7f0204958c0f81b7846c0f5b':
SDK Manager: sort packages from remote repositories.
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:52:57 +0000 (10:52 -0800)]
am
6c142098: am
534c38a2: Merge change I919980d2 into eclair-sdk
Merge commit '
6c142098bb3cf32ae8201c91f5d9d741e8832e58' into eclair-plus-aosp
* commit '
6c142098bb3cf32ae8201c91f5d9d741e8832e58':
Display a message in the SDK Manager when a new schema tool is available.
Xavier Ducrohet [Thu, 19 Nov 2009 18:52:54 +0000 (10:52 -0800)]
am
0aaed034: am
ca6bb022: (-s ours) Merge change Ie805d2fa into eclair-sdk
Merge commit '
0aaed034094ace5d96ffb92f8094b508bf8a8513' into eclair-plus-aosp
* commit '
0aaed034094ace5d96ffb92f8094b508bf8a8513':
Move Eclipse plug-ins to 0.9.5 (do not merge)
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:47:42 +0000 (17:47 -0800)]
am
5c354903: am
f1d64e29: Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
Merge commit '
5c354903f8b77440a0b8c95e665018be077a3812' into eclair-plus-aosp
* commit '
5c354903f8b77440a0b8c95e665018be077a3812':
Fix the sdk/scritps/create_*_symlinks for the new SDK git project.
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:52:37 +0000 (16:52 -0800)]
am
0853b4ca: am
d8ef7816: Remove sdk_clean.sh (moved to development/build/tools)
Merge commit '
0853b4caccc14ad93e6278f30ab1743d997d63de' into eclair-plus-aosp
* commit '
0853b4caccc14ad93e6278f30ab1743d997d63de':
Remove sdk_clean.sh (moved to development/build/tools)
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)
Raphael [Tue, 17 Nov 2009 03:42:38 +0000 (19:42 -0800)]
am
20d03274: Merge change I6809bd44 into eclair
Merge commit '
20d0327492490b676a0a1036754e7742fb92bb69' into eclair-plus-aosp
* commit '
20d0327492490b676a0a1036754e7742fb92bb69':
SDK Manager: XML Schema for sdk-repository v2
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
David 'Digit' Turner [Mon, 16 Nov 2009 23:00:17 +0000 (15:00 -0800)]
am
e4df0ea1: Merge change I8d8b5816 into eclair
Merge commit '
e4df0ea14bcfc6e2d395e36970749cf9a916a0fb' into eclair-plus-aosp
* commit '
e4df0ea14bcfc6e2d395e36970749cf9a916a0fb':
Update build-toolchain.sh to be able to build gcc 4.4.0
David 'Digit' Turner [Mon, 16 Nov 2009 23:00:13 +0000 (15:00 -0800)]
am
f3ec7a02: Merge change If72f81fb into eclair
Merge commit '
f3ec7a02777ed9fcbe995711b8cb3f31de01d274' into eclair-plus-aosp
* commit '
f3ec7a02777ed9fcbe995711b8cb3f31de01d274':
Add a script to download and package the toolchain sources.
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:29:55 +0000 (14:29 -0800)]
am
5df7d75e: am
f4c63fae: SDK Manager support for future schemas.
Merge commit '
5df7d75e1c9cc73b4fe0111f89f099e8dba3486b' into eclair-plus-aosp
* commit '
5df7d75e1c9cc73b4fe0111f89f099e8dba3486b':
SDK Manager support for future schemas.
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:18:35 +0000 (13:18 -0800)]
am
6dcf4214: resolved conflicts for merge of
0da4f158 to eclair
Merge commit '
6dcf42149b183e2a2a062c90d60a2803cf01523a' into eclair-plus-aosp
* commit '
6dcf42149b183e2a2a062c90d60a2803cf01523a':
SDK Manager: phase 1 of support for future schemas
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
Xavier Ducrohet [Mon, 16 Nov 2009 20:54:27 +0000 (12:54 -0800)]
am
a0ac4b14: am
b624370d: (-s ours) Rename the layout device from ION to ADP2. (do not merge)
Merge commit '
a0ac4b1492ae742e2f12138b647ea9781054a1b0' into eclair-plus-aosp
* commit '
a0ac4b1492ae742e2f12138b647ea9781054a1b0':
Rename the layout device from ION to ADP2. (do not merge)
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)
OSDN Git Service
