summaryrefslogtreecommitdiff
path: root/sdk-updates
diff options
context:
space:
mode:
authorJoe Baker-Malone <jbakermalone@google.com>2015-05-26 10:48:04 -0700
committerTor Norbye <tnorbye@google.com>2015-05-29 17:38:55 -0700
commit315715df322b9defb6bb4aaee08ef327dcdc860c (patch)
treeaba5e97512cd0d4ee7cb3e61f7101b208e8a1a50 /sdk-updates
parent9c6ee91a3f1e9ccd613fef2685202cc6a9276dbd (diff)
downloadidea-315715df322b9defb6bb4aaee08ef327dcdc860c.tar.gz
Fixing update status text when we have a preview installed
Change-Id: Ia78b19659da4c8dd3e04bfec2443108d57af9e2d
Diffstat (limited to 'sdk-updates')
-rw-r--r--sdk-updates/src/com/android/tools/idea/updater/SdkComponentSource.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/sdk-updates/src/com/android/tools/idea/updater/SdkComponentSource.java b/sdk-updates/src/com/android/tools/idea/updater/SdkComponentSource.java
index 4b7e9f7035f..33a0d4fca74 100644
--- a/sdk-updates/src/com/android/tools/idea/updater/SdkComponentSource.java
+++ b/sdk-updates/src/com/android/tools/idea/updater/SdkComponentSource.java
@@ -179,9 +179,11 @@ public class SdkComponentSource implements ExternalComponentSource {
result.add(Pair.create("Android SDK Tools:", toolsRevision.toString()));
}
if (platformVersion != null) {
- result.add(Pair.create("Android Platform Version:", SdkVersionInfo.getAndroidName(platformVersion.getApiLevel()) +
- " revision " +
- platformRevision));
+ result.add(Pair.create("Android Platform Version:", String.format("%1$s revision %2$s",
+ platformVersion.getCodename() != null ?
+ platformVersion.getCodename() :
+ SdkVersionInfo.getAndroidName(platformVersion.getApiLevel()),
+ platformRevision)));
}
resultFuture.set(result);
}