Revert ScreenLayoutSize to ScreenSize.

I hadn't noticed that LayoutLib actually uses ScrenSize
through the tools-common-prebuilt.jar, so this API is (somewhat*)
frozen.

* Somewhat because LayoutLib.jar actually only uses Density and
ScreenSize but not the other enums (yet?) so the rename of DockMode
is not a problem.

Change-Id: Ida3360b0111abd96d2a27c16833b282706774fb6

3 files changed, 29 insertions, 29 deletions

diff --git a/ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java b/ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java
index c0d1293..cda30c5 100644
--- a/ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java
+++ b/ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java
@@ -229,7 +229,7 @@ public final class FolderConfiguration implements Comparable<FolderConfiguration
         } else if (qualifier instanceof ScreenHeightQualifier) {
             mQualifiers[INDEX_SCREEN_HEIGHT] = qualifier;
 
-        } else if (qualifier instanceof ScreenLayoutSizeQualifier) {
+        } else if (qualifier instanceof ScreenSizeQualifier) {
             mQualifiers[INDEX_SCREEN_LAYOUT_SIZE] = qualifier;
 
         } else if (qualifier instanceof ScreenRatioQualifier) {
@@ -350,12 +350,12 @@ public final class FolderConfiguration implements Comparable<FolderConfiguration
         return (ScreenHeightQualifier) mQualifiers[INDEX_SCREEN_HEIGHT];
     }
 
-    public void setScreenLayoutSizeQualifier(ScreenLayoutSizeQualifier qualifier) {
+    public void setScreenSizeQualifier(ScreenSizeQualifier qualifier) {
         mQualifiers[INDEX_SCREEN_LAYOUT_SIZE] = qualifier;
     }
 
-    public ScreenLayoutSizeQualifier getScreenLayoutSizeQualifier() {
-        return (ScreenLayoutSizeQualifier)mQualifiers[INDEX_SCREEN_LAYOUT_SIZE];
+    public ScreenSizeQualifier getScreenSizeQualifier() {
+        return (ScreenSizeQualifier)mQualifiers[INDEX_SCREEN_LAYOUT_SIZE];
     }
 
     public void setScreenRatioQualifier(ScreenRatioQualifier qualifier) {
@@ -846,7 +846,7 @@ public final class FolderConfiguration implements Comparable<FolderConfiguration
         mQualifiers[INDEX_SMALLEST_SCREEN_WIDTH] = new SmallestScreenWidthQualifier();
         mQualifiers[INDEX_SCREEN_WIDTH] = new ScreenWidthQualifier();
         mQualifiers[INDEX_SCREEN_HEIGHT] = new ScreenHeightQualifier();
-        mQualifiers[INDEX_SCREEN_LAYOUT_SIZE] = new ScreenLayoutSizeQualifier();
+        mQualifiers[INDEX_SCREEN_LAYOUT_SIZE] = new ScreenSizeQualifier();
         mQualifiers[INDEX_SCREEN_RATIO] = new ScreenRatioQualifier();
         mQualifiers[INDEX_SCREEN_ORIENTATION] = new ScreenOrientationQualifier();
         mQualifiers[INDEX_UI_MODE] = new UiModeQualifier();
diff --git a/ide_common/src/com/android/ide/common/resources/configuration/ScreenLayoutSizeQualifier.java b/ide_common/src/com/android/ide/common/resources/configuration/ScreenSizeQualifier.java
index 0f22d36..7ab6dd8 100644
--- a/ide_common/src/com/android/ide/common/resources/configuration/ScreenLayoutSizeQualifier.java
+++ b/ide_common/src/com/android/ide/common/resources/configuration/ScreenSizeQualifier.java
@@ -17,26 +17,26 @@
 package com.android.ide.common.resources.configuration;
 
 import com.android.resources.ResourceEnum;
-import com.android.resources.ScreenLayoutSize;
+import com.android.resources.ScreenSize;
 
 /**
  * Resource Qualifier for Screen Size. Size can be "small", "normal", "large" and "x-large"
  */
-public class ScreenLayoutSizeQualifier extends EnumBasedResourceQualifier {
+public class ScreenSizeQualifier extends EnumBasedResourceQualifier {
 
     public static final String NAME = "Screen Size";
 
-    private ScreenLayoutSize mValue = null;
+    private ScreenSize mValue = null;
 
 
-    public ScreenLayoutSizeQualifier() {
+    public ScreenSizeQualifier() {
     }
 
-    public ScreenLayoutSizeQualifier(ScreenLayoutSize value) {
+    public ScreenSizeQualifier(ScreenSize value) {
         mValue = value;
     }
 
-    public ScreenLayoutSize getValue() {
+    public ScreenSize getValue() {
         return mValue;
     }
 
@@ -57,10 +57,10 @@ public class ScreenLayoutSizeQualifier extends EnumBasedResourceQualifier {
 
     @Override
     public boolean checkAndSet(String value, FolderConfiguration config) {
-        ScreenLayoutSize size = ScreenLayoutSize.getEnum(value);
+        ScreenSize size = ScreenSize.getEnum(value);
         if (size != null) {
-            ScreenLayoutSizeQualifier qualifier = new ScreenLayoutSizeQualifier(size);
-            config.setScreenLayoutSizeQualifier(qualifier);
+            ScreenSizeQualifier qualifier = new ScreenSizeQualifier(size);
+            config.setScreenSizeQualifier(qualifier);
             return true;
         }
 
diff --git a/ide_common/tests/src/com/android/ide/common/resources/configuration/ScreenSizeQualifierTest.java b/ide_common/tests/src/com/android/ide/common/resources/configuration/ScreenSizeQualifierTest.java
index d05399d..b19f125 100644
--- a/ide_common/tests/src/com/android/ide/common/resources/configuration/ScreenSizeQualifierTest.java
+++ b/ide_common/tests/src/com/android/ide/common/resources/configuration/ScreenSizeQualifierTest.java
@@ -16,19 +16,19 @@
 
 package com.android.ide.common.resources.configuration;
 
-import com.android.resources.ScreenLayoutSize;
+import com.android.resources.ScreenSize;
 
 import junit.framework.TestCase;
 
 public class ScreenSizeQualifierTest extends TestCase {
 
-    private ScreenLayoutSizeQualifier ssq;
+    private ScreenSizeQualifier ssq;
     private FolderConfiguration config;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        ssq = new ScreenLayoutSizeQualifier();
+        ssq = new ScreenSizeQualifier();
         config = new FolderConfiguration();
     }
 
@@ -41,29 +41,29 @@ public class ScreenSizeQualifierTest extends TestCase {
 
     public void testSmall() {
         assertEquals(true, ssq.checkAndSet("small", config)); //$NON-NLS-1$
-        assertTrue(config.getScreenLayoutSizeQualifier() != null);
-        assertEquals(ScreenLayoutSize.SMALL, config.getScreenLayoutSizeQualifier().getValue());
-        assertEquals("small", config.getScreenLayoutSizeQualifier().toString()); //$NON-NLS-1$
+        assertTrue(config.getScreenSizeQualifier() != null);
+        assertEquals(ScreenSize.SMALL, config.getScreenSizeQualifier().getValue());
+        assertEquals("small", config.getScreenSizeQualifier().toString()); //$NON-NLS-1$
     }
 
     public void testNormal() {
         assertEquals(true, ssq.checkAndSet("normal", config)); //$NON-NLS-1$
-        assertTrue(config.getScreenLayoutSizeQualifier() != null);
-        assertEquals(ScreenLayoutSize.NORMAL, config.getScreenLayoutSizeQualifier().getValue());
-        assertEquals("normal", config.getScreenLayoutSizeQualifier().toString()); //$NON-NLS-1$
+        assertTrue(config.getScreenSizeQualifier() != null);
+        assertEquals(ScreenSize.NORMAL, config.getScreenSizeQualifier().getValue());
+        assertEquals("normal", config.getScreenSizeQualifier().toString()); //$NON-NLS-1$
     }
 
     public void testLarge() {
         assertEquals(true, ssq.checkAndSet("large", config)); //$NON-NLS-1$
-        assertTrue(config.getScreenLayoutSizeQualifier() != null);
-        assertEquals(ScreenLayoutSize.LARGE, config.getScreenLayoutSizeQualifier().getValue());
-        assertEquals("large", config.getScreenLayoutSizeQualifier().toString()); //$NON-NLS-1$
+        assertTrue(config.getScreenSizeQualifier() != null);
+        assertEquals(ScreenSize.LARGE, config.getScreenSizeQualifier().getValue());
+        assertEquals("large", config.getScreenSizeQualifier().toString()); //$NON-NLS-1$
     }
 
     public void testXLarge() {
         assertEquals(true, ssq.checkAndSet("xlarge", config)); //$NON-NLS-1$
-        assertTrue(config.getScreenLayoutSizeQualifier() != null);
-        assertEquals(ScreenLayoutSize.XLARGE, config.getScreenLayoutSizeQualifier().getValue());
-        assertEquals("xlarge", config.getScreenLayoutSizeQualifier().toString()); //$NON-NLS-1$
+        assertTrue(config.getScreenSizeQualifier() != null);
+        assertEquals(ScreenSize.XLARGE, config.getScreenSizeQualifier().getValue());
+        assertEquals("xlarge", config.getScreenSizeQualifier().toString()); //$NON-NLS-1$
     }
 }