Commit Graph

2272 Commits

Author SHA1 Message Date
Android (Google) Code Review
c390708d03 Merge change 3868 into donut
* changes:
  ADT #1909458: fix 'android update project': "build.xml is too old"
2009-06-11 11:55:36 -07:00
Android (Google) Code Review
4b03e4ea19 am 134c84ab: Merge change 3856 into donut
Merge commit '134c84ab6206fa9929356662943df686412913c7'

* commit '134c84ab6206fa9929356662943df686412913c7':
  SDK Updater: fix install in new directory.
2009-06-11 11:41:48 -07:00
Android (Google) Code Review
134c84ab62 Merge change 3856 into donut
* changes:
  SDK Updater: fix install in new directory.
2009-06-11 10:24:54 -07:00
Android (Google) Code Review
9f6f2a3e1f am 3aa7f5d6: Merge change 3848 into donut
Merge commit '3aa7f5d63706cd031d3eb51bea517c069f10d4be'

* commit '3aa7f5d63706cd031d3eb51bea517c069f10d4be':
  SDK Updater: Revamp ITaskMonitor to be able to create sub monitors.
2009-06-11 00:45:25 -07:00
Raphael
616643f673 SDK Updater: implement tree check callback on remote page. 2009-06-10 23:08:53 -07:00
Raphael
bd13b6ce02 ADT #1909458: fix 'android update project': "build.xml is too old" 2009-06-10 21:33:38 -07:00
Android (Google) Code Review
3aa7f5d637 Merge change 3848 into donut
* changes:
  SDK Updater: Revamp ITaskMonitor to be able to create sub monitors.
2009-06-10 19:49:47 -07:00
Raphael
9888f2038e SDK Updater: fix install in new directory.
Also change the getenv hack so that multiple sources
can be specified, separated by ;
2009-06-10 19:35:50 -07:00
Raphael
b399193542 SDK Updater: Revamp ITaskMonitor to be able to create sub monitors.
This allows us to nest tasks that share the same
progress task dialog..
2009-06-10 18:33:45 -07:00
Android (Google) Code Review
91fe001269 Merge change 3807 into donut
* changes:
  Remove an old backup file.
2009-06-10 17:28:21 -07:00
Android (Google) Code Review
5698228e69 am 04d87fc2: Merge change 3770 into donut
Merge commit '04d87fc25f8cae532aa2a72b36a6c830a84148a8'

* commit '04d87fc25f8cae532aa2a72b36a6c830a84148a8':
  Add SdkManager#reloadSdk().
2009-06-10 17:20:06 -07:00
Android (Google) Code Review
04d87fc25f Merge change 3770 into donut
* changes:
  Add SdkManager#reloadSdk().
2009-06-10 17:11:57 -07:00
Android (Google) Code Review
2bbfa16070 am 64638a16: Merge change 3743 into donut
Merge commit '64638a165fbe0e6320adfc5e2aa4679ed0f94b35'

* commit '64638a165fbe0e6320adfc5e2aa4679ed0f94b35':
  ADT #1856119: 'android update project' can now update sub-projects.
2009-06-10 16:31:37 -07:00
Dan Bornstein
8fe57fa186 Remove an old backup file. 2009-06-10 16:08:38 -07:00
Android (Google) Code Review
7bc453163d am 37c885e4: Merge change 3763 into donut
Merge commit '37c885e48e05d5b139b724e75867554a1e97f309'

* commit '37c885e48e05d5b139b724e75867554a1e97f309':
  SDK Updater: Fix the build.
2009-06-10 15:33:00 -07:00
Android (Google) Code Review
e861b46441 am c52422ac: Merge change 3691 into donut
Merge commit 'c52422ac391cac47ec0599874093fd81b1b8d8d5'

* commit 'c52422ac391cac47ec0599874093fd81b1b8d8d5':
  SDK Updater: handle HTTP proxy settings, load & save.
2009-06-10 15:32:54 -07:00
Android (Google) Code Review
64638a165f Merge change 3743 into donut
* changes:
  ADT #1856119: 'android update project' can now update sub-projects.
2009-06-10 15:30:15 -07:00
Xavier Ducrohet
086594ceab Add SdkManager#reloadSdk(). 2009-06-10 14:49:02 -07:00
Android (Google) Code Review
37c885e48e Merge change 3763 into donut
* changes:
  SDK Updater: Fix the build.
2009-06-10 13:57:03 -07:00
Raphael
5eebba469b SDK Updater: Fix the build.
Seems like the server doesn't have Properties.load(Reader)!??!
2009-06-10 13:51:45 -07:00
Android (Google) Code Review
c52422ac39 Merge change 3691 into donut
* changes:
  SDK Updater: handle HTTP proxy settings, load & save.
2009-06-10 12:35:44 -07:00
Raphael
8e8886e363 SDK Updater: handle HTTP proxy settings, load & save. 2009-06-10 11:39:25 -07:00
Raphael
61df13dec4 ADT #1856119: 'android update project' can now update sub-projects. 2009-06-10 11:34:08 -07:00
Android (Google) Code Review
88766276db am 792de31d: Merge change 3642 into donut
Merge commit '792de31db045e053b154f0e6068f692637f75612'

* commit '792de31db045e053b154f0e6068f692637f75612':
  Use the same lock for Sdk class than the one used for loading the SDK.
2009-06-10 10:34:40 -07:00
Android (Google) Code Review
792de31db0 Merge change 3642 into donut
* changes:
  Use the same lock for Sdk class than the one used for loading the SDK.
2009-06-10 10:33:09 -07:00
Android (Google) Code Review
a63230dc63 am 891968b7: Merge change 3557 into donut
Merge commit '891968b78e9604e0c6f06c3b142bb7274c24bc5b'

* commit '891968b78e9604e0c6f06c3b142bb7274c24bc5b':
  SDK Updater: Support local archives
2009-06-10 07:46:16 -07:00
Raphael
9be7c5b712 SDK Updater: Support local archives
- Change Archive to have a "isLocal" mode.
  - In local mode, Archive.getLocalOsPath gives the install folder.
  - In remote mode, Archive.getUrl gives the download URL.
- Implement delete on local archive.
- Started refreshing all sources. Need to revamp the progress
  dialog to share it accross methods first.
2009-06-09 22:09:34 -07:00
Android (Google) Code Review
0f825c56f5 am 1d7be865: Merge change 3622 into donut
Merge commit '1d7be8653c61636f56d707f11409fc84ba85d37c'

* commit '1d7be8653c61636f56d707f11409fc84ba85d37c':
  Move the custom widgets for avd/targets/apk-config into internal.widgets
2009-06-09 15:39:34 -07:00
Android (Google) Code Review
d7335dd86a am b72302d1: Merge change 3597 into donut
Merge commit 'b72302d19bb451c1a289ef971a232c4b8b065503'

* commit 'b72302d19bb451c1a289ef971a232c4b8b065503':
  Add missing file and remove unused imports
2009-06-09 15:39:29 -07:00
Android (Google) Code Review
3cd7bbd0a1 am 12dcaef6: Merge change 3546 into donut
Merge commit '12dcaef692b71987199c5c7e153c8b94698a757c'

* commit '12dcaef692b71987199c5c7e153c8b94698a757c':
  SDK Updater: fix repo URL
2009-06-09 15:39:17 -07:00
Android (Google) Code Review
9930525f0a am bc61b566: Merge change 3545 into donut
Merge commit 'bc61b566c86b722089703b88eb887d0e4c6acce8'

* commit 'bc61b566c86b722089703b88eb887d0e4c6acce8':
  SDK Updater: fix for new archives.
2009-06-09 15:39:14 -07:00
Xavier Ducrohet
98198685fd Use the same lock for Sdk class than the one used for loading the SDK.
This will prevent deadlocks when launching Eclipse.
2009-06-09 15:38:45 -07:00
Android (Google) Code Review
1d7be8653c Merge change 3622 into donut
* changes:
  Move the custom widgets for avd/targets/apk-config into internal.widgets
2009-06-09 15:13:44 -07:00
Android (Google) Code Review
b72302d19b Merge change 3597 into donut
* changes:
  Add missing file and remove unused imports
2009-06-09 15:13:40 -07:00
Android (Google) Code Review
12dcaef692 Merge change 3546 into donut
* changes:
  SDK Updater: fix repo URL
2009-06-09 14:22:49 -07:00
Android (Google) Code Review
bc61b566c8 Merge change 3545 into donut
* changes:
  SDK Updater: fix for new archives.
2009-06-09 14:22:40 -07:00
Android (Google) Code Review
0201f6071d am a752dc5f: Merge change 3532 into donut
Merge commit 'a752dc5f8235e208c28c6d0604d2f10c59ba4573'

* commit 'a752dc5f8235e208c28c6d0604d2f10c59ba4573':
  Add menu + bigger icons for MacOS. Also added name to shell (macos also)
2009-06-09 14:09:00 -07:00
Xavier Ducrohet
0d33d5a5cc Move the custom widgets for avd/targets/apk-config into internal.widgets 2009-06-09 13:49:51 -07:00
Xavier Ducrohet
553f9c00fd Add missing file and remove unused imports
(git commit -a missed it)
2009-06-09 11:56:46 -07:00
Raphael
986d8a082e SDK Updater: fix repo URL 2009-06-08 21:52:05 -07:00
Raphael
fea501be73 SDK Updater: fix for new archives.
Fix for detecting MacOS platforms correctly.

Fix to account for new archives with a root folder
(the root folder is ignored).

Display why archives are not compatible (print
which OS was not compatible.)
2009-06-08 21:47:04 -07:00
Xavier Ducrohet
66c2833c5d Add menu + bigger icons for MacOS. Also added name to shell (macos also) 2009-06-08 18:35:29 -07:00
Raphael
454985b6b0 SDK Updater: Add optional license elements to XML schema. 2009-06-08 15:19:48 -07:00
Android (Google) Code Review
34fb7ecf1b Merge change 3345 into donut
* changes:
  SDK Updater: Add optional license elements to XML schema.
2009-06-08 13:27:35 -07:00
Android (Google) Code Review
b58701939e am defc3d14: Merge change 3407 into donut
Merge commit 'defc3d14e1b43cbab5877f9c9112b170cc61c4a5'

* commit 'defc3d14e1b43cbab5877f9c9112b170cc61c4a5':
  SDK updater: refactor install into Archive.
2009-06-08 13:26:05 -07:00
Android (Google) Code Review
defc3d14e1 Merge change 3407 into donut
* changes:
  SDK updater: refactor install into Archive.
2009-06-08 13:24:37 -07:00
Xavier Ducrohet
6247235b4c am fd9b2a0b: am c3c97d1d: AI 149620: mkstubs should ignore all the methods/fields/classes with default access. External bug: http://code.google.com/p/android/issues/detail?id=2806 BUG=1901455
Merge commit 'fd9b2a0b72fdd2a4907e786d5e55ab4a6e64f669'

* commit 'fd9b2a0b72fdd2a4907e786d5e55ab4a6e64f669':
  AI 149620: mkstubs should ignore all the methods/fields/classes with default access.
2009-06-08 11:27:41 -07:00
Xavier Ducrohet
fd9b2a0b72 am c3c97d1d: AI 149620: mkstubs should ignore all the methods/fields/classes with default access. External bug: http://code.google.com/p/android/issues/detail?id=2806 BUG=1901455
Merge commit 'c3c97d1db391f4e400343fd69be11c8b1f951ff3' into donut

* commit 'c3c97d1db391f4e400343fd69be11c8b1f951ff3':
  AI 149620: mkstubs should ignore all the methods/fields/classes with default access.
2009-06-08 11:16:44 -07:00
Android (Google) Code Review
bd45dfcdaa am 55899308: Merge change 3342 into donut
Merge commit '5589930805c71791ecdd3c4847bd18aab5eed937'

* commit '5589930805c71791ecdd3c4847bd18aab5eed937':
  Add revision to Android targets.
2009-06-05 21:17:40 -07:00
Raphael
4d18cb21f2 SDK updater: refactor install into Archive. 2009-06-05 19:46:34 -07:00