diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-11-26 14:31:59 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-11-26 14:32:00 -0800 |
| commit | f1e120d3a173d80023fd8f001bbf0960dbc01a3b (patch) | |
| tree | a62204a5cc7d9680195f07e18f4f9431c8c729a1 /sdkmanager/libs/sdkuilib | |
| parent | 19c04f1deaa342b5477bd3d26f7e8434e9a4c0f0 (diff) | |
| parent | a9ea09d08d43d689026a2300089b34d3eaa67a7b (diff) | |
| download | sdk-f1e120d3a173d80023fd8f001bbf0960dbc01a3b.zip sdk-f1e120d3a173d80023fd8f001bbf0960dbc01a3b.tar.gz sdk-f1e120d3a173d80023fd8f001bbf0960dbc01a3b.tar.bz2 | |
Merge "39939: Cannot use 4.0" WVGA, 4.65" 720p device definitions"
Diffstat (limited to 'sdkmanager/libs/sdkuilib')
| -rw-r--r-- | sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java index e88b3e8..b89841f 100644 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdCreationDialog.java @@ -468,10 +468,8 @@ public class AvdCreationDialog extends GridDialog { List<Device> nexus = new ArrayList<Device>(deviceList.size()); List<Device> other = new ArrayList<Device>(deviceList.size()); for (Device device : deviceList) { - if (isNexus(device)) { - if (!isGeneric(device)) { // Filter out repeated definitions - nexus.add(device); - } + if (isNexus(device) && !isGeneric(device)) { + nexus.add(device); } else { other.add(device); } @@ -491,7 +489,7 @@ public class AvdCreationDialog extends GridDialog { String[] labels = new String[devices.length]; for (int i = 0, n = devices.length; i < n; i++) { Device device = devices[i]; - if (isNexus(device)) { + if (isNexus(device) && !isGeneric(device)) { labels[i] = getNexusLabel(device); } else { labels[i] = getGenericLabel(device); |