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

1 files changed, 8 insertions, 8 deletions

diff --git a/common/src/com/android/resources/ScreenLayoutSize.java b/common/src/com/android/resources/ScreenSize.java
index 12c4b91..b6ffc50 100644
--- a/common/src/com/android/resources/ScreenLayoutSize.java
+++ b/common/src/com/android/resources/ScreenSize.java
@@ -20,7 +20,7 @@ package com.android.resources;
  * Screen size enum.
  * <p/>This is used in the manifest in the uses-configuration node and in the resource folder names.
  */
-public enum ScreenLayoutSize implements ResourceEnum {
+public enum ScreenSize implements ResourceEnum {
     SMALL("small", "Small", "Small Screen"), //$NON-NLS-1$
     NORMAL("normal", "Normal", "Normal Screen"), //$NON-NLS-1$
     LARGE("large", "Large", "Large Screen"), //$NON-NLS-1$
@@ -30,7 +30,7 @@ public enum ScreenLayoutSize implements ResourceEnum {
     private final String mShortDisplayValue;
     private final String mLongDisplayValue;
 
-    private ScreenLayoutSize(String value, String shortDisplayValue, String longDisplayValue) {
+    private ScreenSize(String value, String shortDisplayValue, String longDisplayValue) {
         mValue = value;
         mShortDisplayValue = shortDisplayValue;
         mLongDisplayValue = longDisplayValue;
@@ -41,8 +41,8 @@ public enum ScreenLayoutSize implements ResourceEnum {
      * @param value The qualifier value.
      * @return the enum for the qualifier value or null if no matching was found.
      */
-    public static ScreenLayoutSize getEnum(String value) {
-        for (ScreenLayoutSize orient : values()) {
+    public static ScreenSize getEnum(String value) {
+        for (ScreenSize orient : values()) {
             if (orient.mValue.equals(value)) {
                 return orient;
             }
@@ -63,9 +63,9 @@ public enum ScreenLayoutSize implements ResourceEnum {
         return mLongDisplayValue;
     }
 
-    public static int getIndex(ScreenLayoutSize orientation) {
+    public static int getIndex(ScreenSize orientation) {
         int i = 0;
-        for (ScreenLayoutSize orient : values()) {
+        for (ScreenSize orient : values()) {
             if (orient == orientation) {
                 return i;
             }
@@ -76,9 +76,9 @@ public enum ScreenLayoutSize implements ResourceEnum {
         return -1;
     }
 
-    public static ScreenLayoutSize getByIndex(int index) {
+    public static ScreenSize getByIndex(int index) {
         int i = 0;
-        for (ScreenLayoutSize orient : values()) {
+        for (ScreenSize orient : values()) {
             if (i == index) {
                 return orient;
             }