From d353eafe42ec287406998434415364d34abdbd41 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Mon, 26 Jul 2010 14:02:57 -0700 Subject: Fix issue with qualifier combo box not filled up in device mode DO NOT MERGE device mode is when the qualifier values must match what a device would report. For instance nodpi should not be selectable. Cherry-picked from master to tools_r7 Change-Id: I22cbd5b3522ae17d4d7f61e95ca20deeea825a79 --- .../android/ide/eclipse/adt/internal/ui/ConfigurationSelector.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ConfigurationSelector.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ConfigurationSelector.java index fd22298..21703d0 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ConfigurationSelector.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ConfigurationSelector.java @@ -537,10 +537,9 @@ public class ConfigurationSelector extends Composite { private void fillCombo(Combo combo, ResourceEnum[] resEnums) { for (ResourceEnum resEnum : resEnums) { // only add the enum if: - // - it's not a fake value. Those are never added as they are used for internal purpose - // only. - // - if it's a valid value for device only if mDeviceMode is true. - if ((mDeviceMode == false || resEnum.isValidValueForDevice() == false) && + // device mode is false OR (device mode is true and) it's a valid device value. + // Also, always ignore fake values. + if ((mDeviceMode == false || resEnum.isValidValueForDevice()) && resEnum.isFakeValue() == false) { combo.add(resEnum.getShortDisplayValue()); } -- cgit v1.1