diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-08-27 14:41:23 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-27 14:41:24 -0700 |
| commit | 08b2f649d69dfbd025dfb5d4e01ede0977b640dc (patch) | |
| tree | 3a0be51681368d9ff29f83ebf5a4e2c2ceb241af | |
| parent | 26b71e37d87f2ad025ffb335f0edbf73fc23d725 (diff) | |
| parent | 5e306f55c4aa8a72fa208e082af74821c667e623 (diff) | |
| download | sdk-08b2f649d69dfbd025dfb5d4e01ede0977b640dc.zip sdk-08b2f649d69dfbd025dfb5d4e01ede0977b640dc.tar.gz sdk-08b2f649d69dfbd025dfb5d4e01ede0977b640dc.tar.bz2 | |
Merge "Inline devices if there is only one manufacturer"
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java index 2a0a396..1e80ce1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java @@ -1909,10 +1909,13 @@ public class ConfigurationComposite extends Composite devices.add(device); } for (List<Device> devices : manufacturers.values()) { - MenuItem item = new MenuItem(menu, SWT.CASCADE); - item.setText(devices.get(0).getManufacturer()); - Menu manufacturerMenu = new Menu(menu); - item.setMenu(manufacturerMenu); + Menu manufacturerMenu = menu; + if (manufacturers.size() > 1) { + MenuItem item = new MenuItem(menu, SWT.CASCADE); + item.setText(devices.get(0).getManufacturer()); + manufacturerMenu = new Menu(menu); + item.setMenu(manufacturerMenu); + } for (final Device d : devices) { MenuItem deviceItem = new MenuItem(manufacturerMenu, SWT.CHECK); deviceItem.setText(d.getName()); @@ -1928,7 +1931,6 @@ public class ConfigurationComposite extends Composite }); } } - } // TODO - how do I dispose of this? |