Commit Graph

433 Commits

Author SHA1 Message Date
Xavier Ducrohet
c15ed2d771 Fix a double issue regarding interrupted builds due to pre-existing errors.
First, the ApkBuilder didn't cancel its run if the project had markers from JDT.
Second, the try/catch on ApkBuilder#build didn't properly test the
CoreException status severity (used getCode instead of getSeverity), so it did
not detect cancels being thrown by #abortOnBadSetup and displayed the error
in the console instead.
2009-05-13 18:03:14 -07:00
Xavier Ducrohet
1e074599b5 am 20d4ecf: ADT: remove an obsolete import from the manifest.
Merge commit '20d4ecf2d785bb0120222ab4ab249abc1165314c'

* commit '20d4ecf2d785bb0120222ab4ab249abc1165314c':
  ADT: remove an obsolete import from the manifest.
2009-05-13 17:46:49 -07:00
Xavier Ducrohet
f6d154a2b7 am 770dfc5: ADT: Refactoring classes dealing with android resources out
Merge commit '770dfc5ed43089228af1892eef3a73a0e7220bc7'

* commit '770dfc5ed43089228af1892eef3a73a0e7220bc7':
  ADT: Refactoring classes dealing with android resources out of the editor.
2009-05-13 17:46:49 -07:00
Xavier Ducrohet
20d4ecf2d7 ADT: remove an obsolete import from the manifest. 2009-05-13 17:41:07 -07:00
Xavier Ducrohet
770dfc5ed4 ADT: Refactoring classes dealing with android resources out of the editor.
Basically:
editors.resources.manager -> resources.manager
editors.resources.configurations -> resources.configurations

This is to make it less confusing between the "Resources editors" and the
class parsing/handling Android resources (either in a project or in the
framework).
Also moved the ResourceExplorerView out of the resources editors, and clean
up a few other misc classes.
2009-05-13 17:36:25 -07:00
Xavier Ducrohet
30e2507154 am 5bb7e1e: ADT: Move more packages into internal:
Merge commit '5bb7e1e0cdb1b135968b279f7e4350769160ba11'

* commit '5bb7e1e0cdb1b135968b279f7e4350769160ba11':
  ADT: Move more packages into internal:
2009-05-13 17:27:15 -07:00
Xavier Ducrohet
5bb7e1e0cd ADT: Move more packages into internal:
editors -> adt.internal.editors.

This also marks the final refactoring of combining previous editors/common
plugin under the adt package.
2009-05-13 17:23:00 -07:00
Xavier Ducrohet
cb975e4579 am 9ed226a: ADT: Move more packages into internal.
Merge commit '9ed226af6a2946146a989f3c066150a8a98e4a1d'

* commit '9ed226af6a2946146a989f3c066150a8a98e4a1d':
  ADT: Move more packages into internal.
2009-05-13 17:19:08 -07:00
Xavier Ducrohet
9ed226af6a ADT: Move more packages into internal.
common.project -> adt.internal.project
adt.resources -> adt.internal.resources
adt.wizards.* -> adt.internal.wizards
adt.ui -> adt.internal.ui
2009-05-13 17:13:15 -07:00
Xavier Ducrohet
272de4c149 am 4cc22e5: ADT: Move more packages into internal
Merge commit '4cc22e5ebf7c69e06a6cbf893a97d2ade46c0d54'

* commit '4cc22e5ebf7c69e06a6cbf893a97d2ade46c0d54':
  ADT: Move more packages into internal
2009-05-13 17:07:08 -07:00
Xavier Ducrohet
4cc22e5ebf ADT: Move more packages into internal
project.*
refactorings.*

Also: moved the export wizard from project.export to wizards.export, moved some
actions out of project into the new internal package actions.
2009-05-13 17:03:26 -07:00
Xavier Ducrohet
a12c1c44a9 am f127736: ADT: Remove StreamHelper and integrate it in AdtPlugin.
Merge commit 'f12773626484df90e08e5e50bdca81846950218e'

* commit 'f12773626484df90e08e5e50bdca81846950218e':
  ADT: Remove StreamHelper and integrate it in AdtPlugin.
2009-05-13 16:54:42 -07:00
Xavier Ducrohet
f127736264 ADT: Remove StreamHelper and integrate it in AdtPlugin.
StreamHelper was used before by AdtPlugin, DdmsPlugin and EditorsPlugin. It's now
only used by AdtPlugin, so the only 2 methods in it can go in AdtPlugin.
I merged the externalized string in the messages.properties file used by AdtPlugin.
2009-05-13 16:46:31 -07:00
Xavier Ducrohet
d91a37c3ee am 9eedccd: Moved more ADT packages into internal.
Merge commit '9eedccd52c6a6c579edf240afd397439691057d6'

* commit '9eedccd52c6a6c579edf240afd397439691057d6':
  Moved more ADT packages into internal.
2009-05-13 16:45:46 -07:00
Xavier Ducrohet
9eedccd52c Moved more ADT packages into internal.
adt.build
adt.launch.*
adt.preferences

Also started combining adt and common.
2009-05-13 16:37:55 -07:00
Xavier Ducrohet
6f2b3b4e4c am 2c83a9f: Update ADT to use the refactored sdklib from previous patch.
Merge commit '2c83a9f10cc8ac33e1caf411da571e2aa85c0909'

* commit '2c83a9f10cc8ac33e1caf411da571e2aa85c0909':
  Update ADT to use the refactored sdklib from previous patch.
2009-05-13 15:14:32 -07:00
Xavier Ducrohet
2c83a9f10c Update ADT to use the refactored sdklib from previous patch. 2009-05-13 15:10:20 -07:00
Android (Google) Code Review
26245919e5 am 9f6a426: Merge change 1237 into donut
Merge commit '9f6a4264531682d2911ace24aa5f7ef751bb2b6b'

* commit '9f6a4264531682d2911ace24aa5f7ef751bb2b6b':
  ADT #1715616: "New Android Test Project" wizard.
2009-05-08 22:49:30 -07:00
Raphael
0b62151cda ADT #1715616: "New Android Test Project" wizard.
Also updates eclipse/changes.txt
2009-05-08 14:06:44 -07:00
Raphael
9ad2ed9773 am 1bb52f2: Fix ADT junit test for AndroidManifestParser following API c
Merge commit '1bb52f25870a0f183b9c5a24362c2468fb316435'

* commit '1bb52f25870a0f183b9c5a24362c2468fb316435':
  Fix ADT junit test for AndroidManifestParser following API change.
2009-05-05 13:59:21 -07:00
Raphael
1bb52f2587 Fix ADT junit test for AndroidManifestParser following API change. 2009-05-05 13:41:59 -07:00
Raphael
955d82083f am 816ba07: ADT #1825491: Provide default choices for <uses-library>
Merge commit '816ba073c618e4f1c2085451d117d463e71680a0'

* commit '816ba073c618e4f1c2085451d117d463e71680a0':
  ADT #1825491: Provide default choices for <uses-library>
2009-05-04 15:58:21 -07:00
Raphael
816ba073c6 ADT #1825491: Provide default choices for <uses-library>
We currently hardcode a list in the PlatformTarget and propagate
it to the UI via the AndroidTargetParser. This way we can later
decide to actually get the info from some kind of manifest.
2009-05-04 15:37:40 -07:00
Raphael
b55cd69033 am beb3214: ADT #1823896: Ability to add an "extra" action to the AVD Se
Merge commit 'beb3214b46e18bb461760c47f04c5b909557d060'

* commit 'beb3214b46e18bb461760c47f04c5b909557d060':
  ADT #1823896: Ability to add an "extra" action to the AVD Selector.
2009-05-01 14:08:07 -07:00
Raphael
beb3214b46 ADT #1823896: Ability to add an "extra" action to the AVD Selector.
Used to display the AVD Manager from the Device Chooser/Launch config.
Used to delete AVDs from the AVD Manager.

In AVD Manager, also hide the Cancel button since actions are
immediate and not cancelable.
2009-05-01 13:58:31 -07:00
Android (Google) Code Review
bf0be65da0 am 7d64517: Merge change 839 into donut
Merge commit '7d645177b5946f2f4b0491462f0046492a1cf43c'

* commit '7d645177b5946f2f4b0491462f0046492a1cf43c':
  ADT #1823896: AVD Manager button in the AVD Selector.
2009-04-30 18:11:16 -07:00
Xavier Ducrohet
625180dd22 merged development with conflicts.... 2009-04-30 17:35:21 -07:00
Raphael
e940a1cad7 ADT #1823896: AVD Manager button in the AVD Selector.
Device chooser: avd manager callback + avd list refresh.
Device chooser: dialog title.
Device launcher tab: avd manager callaback + avd list refresh.
2009-04-30 17:14:58 -07:00
Xavier Ducrohet
7bfac3d8c7 Display the AVD manager wizard during launches where no compatible AVDs exist. 2009-04-30 14:20:33 -07:00
Android (Google) Code Review
30ef68fc35 am 9e2993e: Merge change 770 into donut
Merge commit '9e2993ed2e07c21262d83294388e0ff09a005866'

* commit '9e2993ed2e07c21262d83294388e0ff09a005866':
  ADT 1603194: Android Package browser for Instrumentation nodes.
2009-04-30 12:33:07 -07:00
Android (Google) Code Review
9e2993ed2e Merge change 770 into donut
* changes:
  ADT 1603194: Android Package browser for Instrumentation nodes.
2009-04-30 11:59:01 -07:00
Xavier Ducrohet
bef7556739 am 70fc6e9: Make sure that any exception during the final packaging prop
Merge commit '70fc6e96af1213c192160a16803feb220e10c561'

* commit '70fc6e96af1213c192160a16803feb220e10c561':
  Make sure that any exception during the final packaging properly put an error marker on the project (since build failed.
2009-04-29 21:20:31 -07:00
Raphael
1a93c942f0 ADT 1603194: Android Package browser for Instrumentation nodes. 2009-04-29 17:36:39 -07:00
Xavier Ducrohet
70fc6e96af Make sure that any exception during the final packaging properly put an error marker on the project (since build failed. 2009-04-29 14:38:30 -07:00
Android (Google) Code Review
1d0740fddd am 8ffde4b: Merge change 715 into donut
Merge commit '8ffde4bf375063f622a5227c349506cb6721f660'

* commit '8ffde4bf375063f622a5227c349506cb6721f660':
  ADT #1820114: Provide a quick UI to edit AVD.
2009-04-29 13:10:16 -07:00
Android (Google) Code Review
bce459e95a am 5949992: Merge change 627 into donut
Merge commit '594999277ec269bc706647b23ecc11e16f12a971'

* commit '594999277ec269bc706647b23ecc11e16f12a971':
  Fix a bunch of issues related to packaging the content of libs (NPE with files with no extension, not ignoring ignorable folders). Also fixed an issue when parsing Manifest with <uses-sdk />
2009-04-29 12:06:41 -07:00
Xavier Ducrohet
a0385be052 am 1ec5e2f: Move ADT to 0.9.1
Merge commit '1ec5e2f4bb6ac9b5954558033894a5c95e14d7a1'

* commit '1ec5e2f4bb6ac9b5954558033894a5c95e14d7a1':
  Move ADT to 0.9.1
2009-04-29 12:06:41 -07:00
Android (Google) Code Review
27d57ebff0 am dc7622d: Merge change 609 into donut
Merge commit 'dc7622dca5bd355d57dd07c332d40b2a16b79bdc'

* commit 'dc7622dca5bd355d57dd07c332d40b2a16b79bdc':
  Fix the opt-in window for usage stat so that it works when running from ADT.
2009-04-29 12:06:40 -07:00
Raphael
6cbe3d9692 am aa8c266: Split development/.gitignore into separate gitignore files p
Merge commit 'aa8c266ed05c08af71bfdaa48de44bec3d581102'

* commit 'aa8c266ed05c08af71bfdaa48de44bec3d581102':
  Split development/.gitignore into separate gitignore files per project.
2009-04-29 12:06:40 -07:00
Raphael
b7327498cb ADT #1820114: Provide a quick UI to edit AVD.
This is temporary and will be replaced once we get the standalone AVD UI.
2009-04-29 11:29:55 -07:00
Android (Google) Code Review
594999277e Merge change 627 into donut
* changes:
  Fix a bunch of issues related to packaging the content of libs (NPE with files with no extension, not ignoring ignorable folders). Also fixed an issue when parsing Manifest with <uses-sdk />
2009-04-28 11:02:14 -07:00
Xavier Ducrohet
1ec5e2f4bb Move ADT to 0.9.1 2009-04-27 19:02:03 -07:00
Xavier Ducrohet
d1e88a3fcb Fix a bunch of issues related to packaging the content of libs (NPE with files with no extension, not ignoring ignorable folders). Also fixed an issue when parsing Manifest with <uses-sdk /> 2009-04-27 18:52:49 -07:00
Xavier Ducrohet
fe3af81580 Fix the opt-in window for usage stat so that it works when running from ADT. 2009-04-27 15:05:06 -07:00
Raphael
aa8c266ed0 Split development/.gitignore into separate gitignore files per project.
Added missing gitignore for layoutlib_utils.
Changed mkstubs build path to use prebuilt/asm-3.1 instead of asm-3.1 project.
2009-04-26 18:12:36 -07:00
Raphael Moll
8cf1231f49 Merge branch 'readonly-p4-master' 2009-04-21 15:50:54 -07:00
Raphael Moll
faffd247ee AI 147264: am: CL 147262 ADT #1761055: Pre-select node types when adding node in manifest & resource based on context
Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 147264
2009-04-21 15:49:49 -07:00
Raphael Moll
b3b2fa016e AI 147265: am: CL 147264 am: CL 147262 ADT #1761055: Pre-select node types when adding node in manifest & resource based on context
Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147265
2009-04-21 15:49:27 -07:00
Xavier Ducrohet
33ae76683b Merge branch 'readonly-p4-master' 2009-04-18 23:33:28 -07:00
Xavier Ducrohet
8317a67c2e AI 146848: am: CL 146847 am: CL 146845 Fix detecting "home" activities when parsing the Android Manifest
Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146848
2009-04-18 23:32:15 -07:00