diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-01-28 17:47:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-28 17:47:39 +0000 |
| commit | dd55a4635be29de3fbcd94a8c248e2dddae96420 (patch) | |
| tree | 21ebc7aa343e721ea30e925bee2b069b626549ec | |
| parent | 02e41ab536b92ef6fb86c775b86ee564c41d78bc (diff) | |
| parent | 892f37b7b2b59bcb1a83cf415dc378d2a997fc0c (diff) | |
| download | sdk-dd55a4635be29de3fbcd94a8c248e2dddae96420.zip sdk-dd55a4635be29de3fbcd94a8c248e2dddae96420.tar.gz sdk-dd55a4635be29de3fbcd94a8c248e2dddae96420.tar.bz2 | |
Merge "Track LocaleManager API changes" into studio-1.1-dev
automerge: 892f37b
* commit '892f37b7b2b59bcb1a83cf415dc378d2a997fc0c':
Track LocaleManager API changes
2 files changed, 4 insertions, 3 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 9d7ade6..b4926b0 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 @@ -94,6 +94,7 @@ import org.eclipse.swt.widgets.Text; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Locale; import java.util.Set; @@ -870,7 +871,7 @@ public class ConfigurationSelector extends Composite { super(parent, LanguageQualifier.NAME); mLanguage = new Combo(this, SWT.DROP_DOWN); - Set<String> codes = LocaleManager.getLanguageCodes(); + List<String> codes = LocaleManager.getLanguageCodes(); String[] items = codes.toArray(new String[codes.size()]); Arrays.sort(items); mLanguage.setItems(items); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/AddTranslationDialog.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/AddTranslationDialog.java index fcb3139..0301b80 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/AddTranslationDialog.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/AddTranslationDialog.java @@ -275,7 +275,7 @@ public class AddTranslationDialog extends Dialog implements ControlListener, Sel /** Populate the languages dropdown */ private void fillLanguages() { - Set<String> languageCodes = LocaleManager.getLanguageCodes(); + List<String> languageCodes = LocaleManager.getLanguageCodes(); List<String> labels = new ArrayList<String>(); for (String code : languageCodes) { labels.add(code + ": " + LocaleManager.getLanguageName(code)); //$NON-NLS-1$ @@ -291,7 +291,7 @@ public class AddTranslationDialog extends Dialog implements ControlListener, Sel // TODO: When you switch languages, offer some "default" usable options. For example, // when you choose English, offer the countries that use English, and so on. Unfortunately // we don't have good data about this, we'd just need to hardcode a few common cases. - Set<String> regionCodes = LocaleManager.getRegionCodes(); + List<String> regionCodes = LocaleManager.getRegionCodes(); List<String> labels = new ArrayList<String>(); for (String code : regionCodes) { labels.add(code + ": " + LocaleManager.getRegionName(code)); //$NON-NLS-1$ |