diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:29 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:29 -0800 |
| commit | 4fd2474506c1ea3cb96e128d72db2a18ec1e258d (patch) | |
| tree | 5457d1e4f807ae30e59b72f74d876284b20eba9d /sdkmanager/app | |
| parent | b58a893bf9ba96db9a544cd33af4828826b73061 (diff) | |
| download | sdk-4fd2474506c1ea3cb96e128d72db2a18ec1e258d.zip sdk-4fd2474506c1ea3cb96e128d72db2a18ec1e258d.tar.gz sdk-4fd2474506c1ea3cb96e128d72db2a18ec1e258d.tar.bz2 | |
auto import from //branches/cupcake/...@132276
Diffstat (limited to 'sdkmanager/app')
| -rw-r--r-- | sdkmanager/app/src/com/android/sdkmanager/Main.java | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java index 3370e76..1a15fce 100644 --- a/sdkmanager/app/src/com/android/sdkmanager/Main.java +++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java @@ -356,6 +356,7 @@ class Main { */ private void displaySkinList(IAndroidTarget target, String message) { String[] skins = target.getSkins(); + String defaultSkin = target.getDefaultSkin(); mSdkLog.printf(message); if (skins != null) { boolean first = true; @@ -366,6 +367,10 @@ class Main { first = false; } mSdkLog.printf(skin); + + if (skin.equals(defaultSkin)) { + mSdkLog.printf(" (default)"); + } } mSdkLog.printf("\n"); } else { @@ -385,7 +390,7 @@ class Main { int index = 1; for (AvdInfo info : avdManager.getAvds()) { mSdkLog.printf("[%d] %s\n", index, info.getName()); - mSdkLog.printf(" Path: %s\n", info.getPath()); + mSdkLog.printf(" Path: %s\n", info.getPath()); // get the target of the AVD IAndroidTarget target = info.getTarget(); @@ -395,9 +400,23 @@ class Main { } else { mSdkLog.printf(" Target: %s (%s)\n", target.getName(), target .getVendor()); - mSdkLog.printf(" Based on Android %s (API level %d)\n", target + mSdkLog.printf(" Based on Android %s (API level %d)\n", target .getApiVersionName(), target.getApiVersionNumber()); } + + // display some extra values. + Map<String, String> properties = info.getProperties(); + String skin = properties.get(AvdManager.AVD_INI_SKIN_NAME); + if (skin != null) { + mSdkLog.printf(" Skin: %s\n", skin); + } + String sdcard = properties.get(AvdManager.AVD_INI_SDCARD_SIZE); + if (sdcard == null) { + sdcard = properties.get(AvdManager.AVD_INI_SDCARD_PATH); + } + if (sdcard != null) { + mSdkLog.printf(" Sdcard: %s\n", sdcard); + } index++; } @@ -489,7 +508,7 @@ class Main { return; } } - + AvdInfo newAvdInfo = avdManager.createAvd(avdFolder, avdName, target, |