Commit Graph

682 Commits

Author SHA1 Message Date
Android (Google) Code Review
0d375f5b94 am 9811d6b1: Merge change 8298 into donut
Merge commit '9811d6b1f2be41231176236c78ec0d8d512215d0'

* commit '9811d6b1f2be41231176236c78ec0d8d512215d0':
  Minor NPE fix.
2009-07-23 13:29:58 -07:00
Xavier Ducrohet
24c6fbcd9c am a8721e70: Move ADT/DDMS plug-ins to 0.9.2
Merge commit 'a8721e70401212af0277a5d90921798014fc4bd5'

* commit 'a8721e70401212af0277a5d90921798014fc4bd5':
  Move ADT/DDMS plug-ins to 0.9.2
2009-07-23 13:29:49 -07:00
Xavier Ducrohet
9b81f91de6 am a399a681: Add support for add-on based on preview of platforms.
Merge commit 'a399a681d50d820fe530bf7521fa2d95fe0ca998'

* commit 'a399a681d50d820fe530bf7521fa2d95fe0ca998':
  Add support for add-on based on preview of platforms.
2009-07-23 13:29:46 -07:00
Android (Google) Code Review
9811d6b1f2 Merge change 8298 into donut
* changes:
  Minor NPE fix.
2009-07-22 20:01:20 -07:00
Xavier Ducrohet
ce6f5c964f Minor NPE fix. 2009-07-22 19:51:10 -07:00
Xavier Ducrohet
a8721e7040 Move ADT/DDMS plug-ins to 0.9.2 2009-07-22 18:37:33 -07:00
Xavier Ducrohet
a399a681d5 Add support for add-on based on preview of platforms. 2009-07-22 18:12:30 -07:00
Xavier Ducrohet
eecc347ec6 am 6baf93c2: Fix erroneous assert.
Merge commit '6baf93c2c033922755229fcd0fc4453b0a8b85f7'

* commit '6baf93c2c033922755229fcd0fc4453b0a8b85f7':
  Fix erroneous assert.
2009-07-22 16:09:15 -07:00
Xavier Ducrohet
6baf93c2c0 Fix erroneous assert. 2009-07-22 14:08:07 -07:00
Android (Google) Code Review
b0ef3fb3bd am ada18333: Merge change 8196 into donut
Merge commit 'ada18333257cdc14d3cafbddf5d1395574e5132b'

* commit 'ada18333257cdc14d3cafbddf5d1395574e5132b':
  Refactored AndroidXPathFactory into sdklib.
2009-07-22 11:27:39 -07:00
Xavier Ducrohet
1b9c1e4dd2 Refactored AndroidXPathFactory into sdklib. 2009-07-22 09:42:20 -07:00
Android (Google) Code Review
5ab2e21cf5 am 0c51f65b: Merge change 8137 into donut
Merge commit '0c51f65b62e49c1b7ec4c20fdd20126ae36bdf1b'

* commit '0c51f65b62e49c1b7ec4c20fdd20126ae36bdf1b':
  Enforce codename value for minSdkVersion in the Ant build.
2009-07-21 18:53:29 -07:00
Xavier Ducrohet
5adc2f6403 Enforce codename value for minSdkVersion in the Ant build.
If the Ant project is targetting a preview platform, the manifest must
declare minSdkVersion to be the platform codename.
2009-07-21 18:34:15 -07:00
Xavier Ducrohet
76b75fafdd am 8c78ba64: Use the proper URL for the google repository.
Merge commit '8c78ba643862731c603677284ae88089a959cc52'

* commit '8c78ba643862731c603677284ae88089a959cc52':
  Use the proper URL for the google repository.
2009-07-21 15:30:01 -07:00
Xavier Ducrohet
8c78ba6438 Use the proper URL for the google repository.
Also fix an NPE.
2009-07-21 15:25:32 -07:00
Android (Google) Code Review
3aaa5f4fc4 am 277f7af7: Merge change 8064 into donut
Merge commit '277f7af74f2f177c41438e923b54b3dc1ecbe228'

* commit '277f7af74f2f177c41438e923b54b3dc1ecbe228':
  Generalize usage of AndroidVersion instead of Api level in the SDK packages.
2009-07-21 14:38:54 -07:00
Xavier Ducrohet
ce359b0e8a Generalize usage of AndroidVersion instead of Api level in the SDK packages.
Platform, add-on and doc packages used to use Api Level to figure out
upgrade logic. This is replaced by AndroidVersion to properly handle
codename versions.
2009-07-21 13:48:37 -07:00
Android (Google) Code Review
a19fdbbce2 am e2901002: Merge change 7975 into donut
Merge commit 'e2901002a68d5d0debd7c5c41fbf884cb66505e8'

* commit 'e2901002a68d5d0debd7c5c41fbf884cb66505e8':
  Add support for preview versions of platforms.
2009-07-20 23:34:03 -07:00
Xavier Ducrohet
f2869cf9a9 Add support for preview versions of platforms.
ro.build.version.codename is a new property indicating whether a platform
is in its release form (value = REL) or in development (value = dev branch
name such as Donut). When the codename indicates a development/preview version
then the API level must be ignored and this codename is used as a unique
identifier of the platform.

IAndroidTarget has been changed to return an instance of a new class
AndroidVersion instead of the api level directly. This class helps deals with
the logic of comparing version from targets or devices.

This change impacts all of the sdk manager to deal with targets identified by
codename instead of api level. This in turn impacts everything that relies
on the sdkmanager: ADT (build, launch, project creation), the AVD manager,
the SDK updater.
2009-07-20 18:11:21 -07:00
Raphael
da73c40ff0 am dc87dd30: ADT Extract String ID: use Context.getString(id) directly, no need for Context.getResources().
Merge commit 'dc87dd30529a4108d7705f66ab9190ac6eb780b6'

* commit 'dc87dd30529a4108d7705f66ab9190ac6eb780b6':
  ADT Extract String ID: use Context.getString(id) directly,
2009-07-14 10:50:40 -07:00
Raphael
b06c4ae736 am 138a9a4f: ADT Extract String ID: try to find a method or a field that will give the Context for using resource strings.
Merge commit '138a9a4f6e8b40c71fc645d30f0f6c1fe0cb2ee2'

* commit '138a9a4f6e8b40c71fc645d30f0f6c1fe0cb2ee2':
  ADT Extract String ID: try to find a method or a field that will
2009-07-14 10:50:38 -07:00
Raphael
01aebb52dd am b550cce4: ADT XML extract string ID: fix inverted test.
Merge commit 'b550cce443894408ff76eecd99c744787b12bd8b'

* commit 'b550cce443894408ff76eecd99c744787b12bd8b':
  ADT XML extract string ID: fix inverted test.
2009-07-14 10:21:43 -07:00
Raphael
4539243d4b am 7feb9a82: ADT XML extract string ID: generate Context.getResources() calls depending on the Java context of the replacement.
Merge commit '7feb9a82a3731ca6e0795ab8d8df7ca9dc631cb0'

* commit '7feb9a82a3731ca6e0795ab8d8df7ca9dc631cb0':
  ADT XML extract string ID: generate Context.getResources() calls
2009-07-14 10:21:41 -07:00
Raphael
dc87dd3052 ADT Extract String ID: use Context.getString(id) directly,
no need for Context.getResources().
2009-07-14 12:33:06 -04:00
Raphael
138a9a4f6e ADT Extract String ID: try to find a method or a field that will
give the Context for using resource strings.
2009-07-14 11:29:18 -04:00
Raphael
b550cce443 ADT XML extract string ID: fix inverted test. 2009-07-14 08:28:54 -04:00
Raphael
7feb9a82a3 ADT XML extract string ID: generate Context.getResources() calls
depending on the Java context of the replacement.

In the input page also display the string ID values.
2009-07-14 08:11:57 -04:00
Raphael
ecda9e9ec1 am ac50c3ae: ADT XML extract string IDs: display existing IDs of the selected file.
Merge commit 'ac50c3aedfd4e18a3770315708ac4de47906eec4'

* commit 'ac50c3aedfd4e18a3770315708ac4de47906eec4':
  ADT XML extract string IDs: display existing IDs of the
2009-07-12 21:56:39 -07:00
Raphael
5bb0b0a716 am 47acc05b: ADT XML extract string: allow selection to be the attribute name.
Merge commit '47acc05bcf75e0a69cb457c081927e615ce71293'

* commit '47acc05bcf75e0a69cb457c081927e615ce71293':
  ADT XML extract string: allow selection to be the attribute name.
2009-07-12 21:56:38 -07:00
Raphael
47b8a0aa16 am b3ba0afc: ADT: Extract String IDs from Layout XML strings.
Merge commit 'b3ba0afc57c952be18fda38bf6e74d9aa7c0e85b'

* commit 'b3ba0afc57c952be18fda38bf6e74d9aa7c0e85b':
  ADT: Extract String IDs from Layout XML strings.
2009-07-12 21:56:35 -07:00
Raphael
b1f2ca6ea1 am 32ad938b: ADT: Extract String IDs from Layout XML strings.
Merge commit '32ad938b858c5924bccfda78fb7b4b67997e91eb'

* commit '32ad938b858c5924bccfda78fb7b4b67997e91eb':
  ADT: Extract String IDs from Layout XML strings.
2009-07-12 21:56:26 -07:00
Raphael
ac50c3aedf ADT XML extract string IDs: display existing IDs of the
selected file.
2009-07-12 16:05:40 -04:00
Raphael
47acc05bcf ADT XML extract string: allow selection to be the attribute name. 2009-07-12 14:40:41 -04:00
Raphael
b3ba0afc57 ADT: Extract String IDs from Layout XML strings.
This would have been part of CL #7041 if I had not forgotten
a last git commit -a --amend.
2009-07-12 10:41:46 -04:00
Raphael
32ad938b85 ADT: Extract String IDs from Layout XML strings. 2009-07-11 15:22:37 -04:00
Android (Google) Code Review
39fa9224e5 am 9412517b: Merge change 6651 into donut
Merge commit '9412517b3fffc8093c9ebcc4eb6883c111c699f4'

* commit '9412517b3fffc8093c9ebcc4eb6883c111c699f4':
  AVD Selector: Add a "Start" button to launch the selected AVD in a
2009-07-09 12:56:02 -07:00
Android (Google) Code Review
9412517b3f Merge change 6651 into donut
* changes:
  AVD Selector: Add a "Start" button to launch the selected AVD in a new emulator. Doesn't detect if the AVD is already running; instead prints the emulator error.
2009-07-09 12:53:30 -07:00
Raphael
3684b06a4f AVD Selector: Add a "Start" button to launch the selected AVD in a
new emulator. Doesn't detect if the AVD is already running; instead
prints the emulator error.
2009-07-09 15:37:09 -04:00
Raphael
2440130dad am 009801b0: SDK Updater: detect when install addon or tools to deal with updating or restarting adb.
Merge commit '009801b0ad5303a4f9cf9fd9496653bd1cd846de'

* commit '009801b0ad5303a4f9cf9fd9496653bd1cd846de':
  SDK Updater: detect when install addon or tools to deal with
2009-07-06 11:17:51 -07:00
Raphael
6cae31d457 am fa9cd9a6: SDK Updater: fix android.bat for Windows to change dirs to the temp dir. This removes a locked handle to the SDK/tools and allows the update to update its own tools folder.
Merge commit 'fa9cd9a69431cb3a6e1be4092ee498a56714e093'

* commit 'fa9cd9a69431cb3a6e1be4092ee498a56714e093':
  SDK Updater: fix android.bat for Windows to change dirs to the
2009-07-06 11:17:26 -07:00
Raphael
009801b0ad SDK Updater: detect when install addon or tools to deal with
updating or restarting adb.
2009-07-02 21:41:20 -07:00
Raphael
fa9cd9a694 SDK Updater: fix android.bat for Windows to change dirs to the
temp dir. This removes a locked handle to the SDK/tools and allows
the update to update its own tools folder.
2009-07-02 16:21:48 -07:00
Raphael
0865112996 am de21e3ab: Update comments in AvdManager
Merge commit 'de21e3ab24bd8c51290462af072480eada6a0ac7'

* commit 'de21e3ab24bd8c51290462af072480eada6a0ac7':
  Update comments in AvdManager
2009-07-02 15:24:04 -07:00
Android (Google) Code Review
b9b5948e08 am 24d28782: Merge change 5913 into donut
Merge commit '24d287822ff025d65f1767de6ce1d1350e5948f9'

* commit '24d287822ff025d65f1767de6ce1d1350e5948f9':
  SDK Updater: Make it possible for tools to update themselves.
2009-07-02 15:23:35 -07:00
Xavier Ducrohet
832b2c05fd am f5af7ce2: Make ADT use new sdklib API
Merge commit 'f5af7ce21399f9a56167cadaa8196c0b15cfadce'

* commit 'f5af7ce21399f9a56167cadaa8196c0b15cfadce':
  Make ADT use new sdklib API
2009-07-02 14:25:16 -07:00
Xavier Ducrohet
17fb58ccd4 am 59fc8c9d: All actions in AdvManager now receives their own ISdkLog.
Merge commit '59fc8c9d062dbec25da3599a1e38aabaa4b0be8f'

* commit '59fc8c9d062dbec25da3599a1e38aabaa4b0be8f':
  All actions in AdvManager now receives their own ISdkLog.
2009-07-02 14:25:15 -07:00
Xavier Ducrohet
33721951cc am 1ceaaeae: Add tooltips and a legend (AVD selector)
Merge commit '1ceaaeae68b0a3a6bc3617ad0b87c37abeb4005d'

* commit '1ceaaeae68b0a3a6bc3617ad0b87c37abeb4005d':
  Add tooltips and a legend (AVD selector)
2009-07-02 14:25:10 -07:00
Raphael
0c3307e10b am 329c13cb: SDK Updater: refine error handling when fetching sources.
Merge commit '329c13cbe3b771804dbd7d0d5f25b3a51cc6ebee'

* commit '329c13cbe3b771804dbd7d0d5f25b3a51cc6ebee':
  SDK Updater: refine error handling when fetching sources.
2009-07-02 14:25:06 -07:00
Raphael
11afae41ee am 9cf8f819: SDK Updater: Add repository.xml if not specified in URLs
Merge commit '9cf8f819fa655302855789136824573ca98d668d'

* commit '9cf8f819fa655302855789136824573ca98d668d':
  SDK Updater: Add repository.xml if not specified in URLs
2009-07-01 14:18:40 -07:00
Raphael
bcbd3c5ffb am ee763d13: SDK Updater: Better handling of fetch errors.
Merge commit 'ee763d1307e17c8ac8a3adf0d3df22636278dd04'

* commit 'ee763d1307e17c8ac8a3adf0d3df22636278dd04':
  SDK Updater: Better handling of fetch errors.
2009-07-01 14:18:36 -07:00