diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-03-20 22:17:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 22:17:08 +0000 |
| commit | d08f74908ccebd13ebd5298554320aea94da55a0 (patch) | |
| tree | e2989941dd94fe3134d8c0e3239899ef30706093 /eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/VaryingConfiguration.java | |
| parent | 7dc5153994ba1c6506dbf98513269dd65bf95c37 (diff) | |
| parent | 44021bc2138bd92889328f699887fafa40e2ecc6 (diff) | |
| download | sdk-d08f74908ccebd13ebd5298554320aea94da55a0.zip sdk-d08f74908ccebd13ebd5298554320aea94da55a0.tar.gz sdk-d08f74908ccebd13ebd5298554320aea94da55a0.tar.bz2 | |
am 44021bc2: am 39f4d677: Merge "Change Device List to Device Collection." into idea133 automerge: b0e06f6
* commit '44021bc2138bd92889328f699887fafa40e2ecc6':
Change Device List to Device Collection.
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/VaryingConfiguration.java')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/VaryingConfiguration.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/VaryingConfiguration.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/VaryingConfiguration.java index c6e6407..f472cd6 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/VaryingConfiguration.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/VaryingConfiguration.java @@ -28,6 +28,7 @@ import com.android.sdklib.devices.Hardware; import com.android.sdklib.devices.Screen; import com.android.sdklib.devices.State; +import java.util.Collection; import java.util.List; /** @@ -233,7 +234,7 @@ public class VaryingConfiguration extends NestedConfiguration { mPrevParentDevice = device; // Pick a different device - List<Device> devices = mConfigChooser.getDeviceList(); + Collection<Device> devices = mConfigChooser.getDevices(); // Divide up the available devices into {@link #mVariationCount} + 1 buckets // (the + 1 is for the bucket now taken up by the inherited value). |