diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-02 22:54:20 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-02 22:54:20 -0800 |
| commit | 382f18c205f459fdd9ff6c0657beadcbfe3c5b01 (patch) | |
| tree | cf087c09020d087526ef925668e044e39950bbf9 /sdkmanager/app/src | |
| parent | 76bc028c745906e691284c685e34e72b5ccf06b5 (diff) | |
| download | sdk-382f18c205f459fdd9ff6c0657beadcbfe3c5b01.zip sdk-382f18c205f459fdd9ff6c0657beadcbfe3c5b01.tar.gz sdk-382f18c205f459fdd9ff6c0657beadcbfe3c5b01.tar.bz2 | |
auto import from //depot/cupcake/@137055
Diffstat (limited to 'sdkmanager/app/src')
| -rw-r--r-- | sdkmanager/app/src/com/android/sdkmanager/Main.java | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java index 1a15fce..154788e 100644 --- a/sdkmanager/app/src/com/android/sdkmanager/Main.java +++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java @@ -383,24 +383,28 @@ class Main { */ private void displayAvdList() { try { - AvdManager avdManager = new AvdManager(mSdkManager, null /* sdklog */); + AvdManager avdManager = new AvdManager(mSdkManager, mSdkLog); mSdkLog.printf("Available Android Virtual Devices:\n"); - int index = 1; - for (AvdInfo info : avdManager.getAvds()) { - mSdkLog.printf("[%d] %s\n", index, info.getName()); - mSdkLog.printf(" Path: %s\n", info.getPath()); + AvdInfo[] avds = avdManager.getAvds(); + for (int index = 0 ; index < avds.length ; index++) { + AvdInfo info = avds[index]; + if (index > 0) { + mSdkLog.printf("---------\n"); + } + mSdkLog.printf(" Name: %s\n", info.getName()); + mSdkLog.printf(" Path: %s\n", info.getPath()); // get the target of the AVD IAndroidTarget target = info.getTarget(); if (target.isPlatform()) { - mSdkLog.printf(" Target: %s (API level %d)\n", target.getName(), + mSdkLog.printf(" Target: %s (API level %d)\n", target.getName(), target.getApiVersionNumber()); } else { - mSdkLog.printf(" Target: %s (%s)\n", target.getName(), target + 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()); } @@ -408,17 +412,15 @@ class Main { Map<String, String> properties = info.getProperties(); String skin = properties.get(AvdManager.AVD_INI_SKIN_NAME); if (skin != null) { - mSdkLog.printf(" Skin: %s\n", skin); + 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); + mSdkLog.printf(" Sdcard: %s\n", sdcard); } - - index++; } } catch (AndroidLocationException e) { errorAndExit(e.getMessage()); @@ -499,7 +501,7 @@ class Main { // Is it NNNxMMM? if (!valid) { - valid = skin.matches("[0-9]{2,}x[0-9]{2,}"); + valid = AvdManager.NUMERIC_SKIN_SIZE.matcher(skin).matches(); } if (!valid) { |