diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-10-17 16:35:09 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-17 16:35:09 -0700 |
| commit | b8bd06476ddbaa2cf745270e1223508407505217 (patch) | |
| tree | 1553da9ceb4619ed9f7d0d002d20c8130001a650 /eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android | |
| parent | 6e6f84919e31c79b8c51108e791c4a53ad8c413d (diff) | |
| parent | c431088d54a4571f5596e6d1da0069eab62f371b (diff) | |
| download | sdk-b8bd06476ddbaa2cf745270e1223508407505217.zip sdk-b8bd06476ddbaa2cf745270e1223508407505217.tar.gz sdk-b8bd06476ddbaa2cf745270e1223508407505217.tar.bz2 | |
Merge "Update Layoutlib_api to use a class for h/w config."
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android')
2 files changed, 4 insertions, 5 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/UiElementPullParserTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/UiElementPullParserTest.java index 998c166..5cac663 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/UiElementPullParserTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/UiElementPullParserTest.java @@ -170,7 +170,6 @@ public class UiElementPullParserTest extends TestCase { false, // explodedView null, // explodeNodes Density.MEDIUM, // density (default from ConfigurationComposite) - Density.MEDIUM.getDpiValue(), // xdpi (default from ConfigurationComposite) null // iProject ); diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java index c14e7f7..726d9c9 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationTest.java @@ -18,12 +18,12 @@ package com.android.ide.eclipse.adt.internal.editors.layout.configuration; import static com.android.ide.common.resources.configuration.LanguageQualifier.FAKE_LANG_VALUE; import static com.android.ide.common.resources.configuration.RegionQualifier.FAKE_REGION_VALUE; -import com.android.ide.common.api.Rect; import com.android.ide.common.resources.configuration.FolderConfiguration; import com.android.ide.common.resources.configuration.LanguageQualifier; import com.android.resources.Density; import com.android.sdklib.devices.Device; import com.android.sdklib.devices.DeviceManager; +import com.android.sdklib.devices.Screen; import com.android.utils.StdLogger; import java.lang.reflect.Constructor; @@ -97,9 +97,9 @@ public class ConfigurationTest extends TestCase { configuration.toPersistentString()); assertEquals(Density.MEDIUM, configuration.getDensity()); - assertEquals(145.0f, configuration.getXDpi(), 0.001); - assertEquals(145.0f, configuration.getYDpi(), 0.001); - assertEquals(new Rect(0, 0, 320, 480), configuration.getScreenBounds()); + Screen screen = configuration.getDevice().getDefaultHardware().getScreen(); + assertEquals(145.0f, screen.getXdpi(), 0.001); + assertEquals(145.0f, screen.getYdpi(), 0.001); } public void testCopy() throws Exception { |