move the resource enums from the qualifier classes to sdklib.

This is so that other code (like the manifest parser) can use them.

Change-Id: I53be59bbe752e77752e90cedb528f25cf3b3792f

9 files changed, 45 insertions, 54 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java
index 0712cf9..900e031 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java
@@ -26,14 +26,6 @@ import com.android.ide.eclipse.adt.internal.resources.configurations.ScreenRatio
 import com.android.ide.eclipse.adt.internal.resources.configurations.ScreenSizeQualifier;
 import com.android.ide.eclipse.adt.internal.resources.configurations.TextInputMethodQualifier;
 import com.android.ide.eclipse.adt.internal.resources.configurations.TouchScreenQualifier;
-import com.android.ide.eclipse.adt.internal.resources.configurations.KeyboardStateQualifier.KeyboardState;
-import com.android.ide.eclipse.adt.internal.resources.configurations.NavigationMethodQualifier.NavigationMethod;
-import com.android.ide.eclipse.adt.internal.resources.configurations.PixelDensityQualifier.Density;
-import com.android.ide.eclipse.adt.internal.resources.configurations.ScreenOrientationQualifier.ScreenOrientation;
-import com.android.ide.eclipse.adt.internal.resources.configurations.ScreenRatioQualifier.ScreenRatio;
-import com.android.ide.eclipse.adt.internal.resources.configurations.ScreenSizeQualifier.ScreenSize;
-import com.android.ide.eclipse.adt.internal.resources.configurations.TextInputMethodQualifier.TextInputMethod;
-import com.android.ide.eclipse.adt.internal.resources.configurations.TouchScreenQualifier.TouchScreenType;
 import com.android.ide.eclipse.adt.internal.resources.manager.ProjectResources;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager;
 import com.android.ide.eclipse.adt.internal.sdk.AndroidTargetData;
@@ -47,6 +39,14 @@ import com.android.layoutlib.api.IXmlPullParser;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.SdkConstants;
 import com.android.sdklib.io.FolderWrapper;
+import com.android.sdklib.resources.Density;
+import com.android.sdklib.resources.Keyboard;
+import com.android.sdklib.resources.KeyboardState;
+import com.android.sdklib.resources.Navigation;
+import com.android.sdklib.resources.ScreenOrientation;
+import com.android.sdklib.resources.ScreenRatio;
+import com.android.sdklib.resources.ScreenSize;
+import com.android.sdklib.resources.TouchScreen;
 
 import org.kxml2.io.KXmlParser;
 import org.xmlpull.v1.XmlPullParser;
@@ -242,10 +242,10 @@ public class ApiDemosRenderingTest extends SdkTestCase {
         config.addQualifier(new ScreenRatioQualifier(ScreenRatio.NOTLONG));
         config.addQualifier(new ScreenOrientationQualifier(ScreenOrientation.PORTRAIT));
         config.addQualifier(new PixelDensityQualifier(Density.MEDIUM));
-        config.addQualifier(new TouchScreenQualifier(TouchScreenType.FINGER));
+        config.addQualifier(new TouchScreenQualifier(TouchScreen.FINGER));
         config.addQualifier(new KeyboardStateQualifier(KeyboardState.HIDDEN));
-        config.addQualifier(new TextInputMethodQualifier(TextInputMethod.QWERTY));
-        config.addQualifier(new NavigationMethodQualifier(NavigationMethod.TRACKBALL));
+        config.addQualifier(new TextInputMethodQualifier(Keyboard.QWERTY));
+        config.addQualifier(new NavigationMethodQualifier(Navigation.TRACKBALL));
         config.addQualifier(new ScreenDimensionQualifier(480, 320));
 
         return config;
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 7499f5d..72dbf81 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
@@ -19,11 +19,10 @@ package com.android.ide.eclipse.adt.internal.editors.layout;
 import com.android.ide.eclipse.adt.internal.editors.descriptors.AttributeDescriptor;
 import com.android.ide.eclipse.adt.internal.editors.descriptors.ElementDescriptor;
 import com.android.ide.eclipse.adt.internal.editors.descriptors.TextAttributeDescriptor;
-import com.android.ide.eclipse.adt.internal.editors.layout.UiElementPullParser;
 import com.android.ide.eclipse.adt.internal.editors.mock.MockXmlNode;
 import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode;
-import com.android.ide.eclipse.adt.internal.resources.configurations.PixelDensityQualifier.Density;
 import com.android.sdklib.SdkConstants;
+import com.android.sdklib.resources.Density;
 
 import org.w3c.dom.Node;
 import org.xmlpull.v1.XmlPullParser;
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/KeyboardStateQualifierTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/KeyboardStateQualifierTest.java
index 4953747..0ae0a08 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/KeyboardStateQualifierTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/KeyboardStateQualifierTest.java
@@ -18,6 +18,7 @@ package com.android.ide.eclipse.adt.internal.editors.resources.configurations;
 
 import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
 import com.android.ide.eclipse.adt.internal.resources.configurations.KeyboardStateQualifier;
+import com.android.sdklib.resources.KeyboardState;
 
 import junit.framework.TestCase;
 
@@ -43,16 +44,14 @@ public class KeyboardStateQualifierTest extends TestCase {
     public void testExposed() {
         assertEquals(true, ksq.checkAndSet("keysexposed", config)); //$NON-NLS-1$
         assertTrue(config.getKeyboardStateQualifier() != null);
-        assertEquals(KeyboardStateQualifier.KeyboardState.EXPOSED,
-                config.getKeyboardStateQualifier().getValue());
+        assertEquals(KeyboardState.EXPOSED, config.getKeyboardStateQualifier().getValue());
         assertEquals("keysexposed", config.getKeyboardStateQualifier().toString()); //$NON-NLS-1$
     }
 
     public void testHidden() {
         assertEquals(true, ksq.checkAndSet("keyshidden", config)); //$NON-NLS-1$
         assertTrue(config.getKeyboardStateQualifier() != null);
-        assertEquals(KeyboardStateQualifier.KeyboardState.HIDDEN,
-                config.getKeyboardStateQualifier().getValue());
+        assertEquals(KeyboardState.HIDDEN, config.getKeyboardStateQualifier().getValue());
         assertEquals("keyshidden", config.getKeyboardStateQualifier().toString()); //$NON-NLS-1$
     }
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/NavigationMethodQualifierTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/NavigationMethodQualifierTest.java
index 8e5d9ec..384f29f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/NavigationMethodQualifierTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/NavigationMethodQualifierTest.java
@@ -18,6 +18,7 @@ package com.android.ide.eclipse.adt.internal.editors.resources.configurations;
 
 import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
 import com.android.ide.eclipse.adt.internal.resources.configurations.NavigationMethodQualifier;
+import com.android.sdklib.resources.Navigation;
 
 import junit.framework.TestCase;
 
@@ -39,28 +40,25 @@ public class NavigationMethodQualifierTest extends TestCase {
         config = null;
         nmq = null;
     }
-    
+
     public void testDPad() {
         assertEquals(true, nmq.checkAndSet("dpad", config)); //$NON-NLS-1$
         assertTrue(config.getNavigationMethodQualifier() != null);
-        assertEquals(NavigationMethodQualifier.NavigationMethod.DPAD,
-                config.getNavigationMethodQualifier().getValue());
+        assertEquals(Navigation.DPAD, config.getNavigationMethodQualifier().getValue());
         assertEquals("dpad", config.getNavigationMethodQualifier().toString()); //$NON-NLS-1$
     }
 
     public void testTrackball() {
         assertEquals(true, nmq.checkAndSet("trackball", config)); //$NON-NLS-1$
         assertTrue(config.getNavigationMethodQualifier() != null);
-        assertEquals(NavigationMethodQualifier.NavigationMethod.TRACKBALL,
-                config.getNavigationMethodQualifier().getValue());
+        assertEquals(Navigation.TRACKBALL, config.getNavigationMethodQualifier().getValue());
         assertEquals("trackball", config.getNavigationMethodQualifier().toString()); //$NON-NLS-1$
     }
 
     public void testWheel() {
         assertEquals(true, nmq.checkAndSet("wheel", config)); //$NON-NLS-1$
         assertTrue(config.getNavigationMethodQualifier() != null);
-        assertEquals(NavigationMethodQualifier.NavigationMethod.WHEEL,
-                config.getNavigationMethodQualifier().getValue());
+        assertEquals(Navigation.WHEEL, config.getNavigationMethodQualifier().getValue());
         assertEquals("wheel", config.getNavigationMethodQualifier().toString()); //$NON-NLS-1$
     }
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/PixelDensityQualifierTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/PixelDensityQualifierTest.java
index 658d4d2..bb05adb 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/PixelDensityQualifierTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/PixelDensityQualifierTest.java
@@ -18,7 +18,7 @@ package com.android.ide.eclipse.adt.internal.editors.resources.configurations;
 
 import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
 import com.android.ide.eclipse.adt.internal.resources.configurations.PixelDensityQualifier;
-import com.android.ide.eclipse.adt.internal.resources.configurations.PixelDensityQualifier.Density;
+import com.android.sdklib.resources.Density;
 
 import junit.framework.TestCase;
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/ScreenOrientationQualifierTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/ScreenOrientationQualifierTest.java
index 15d9686..452a1ff 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/ScreenOrientationQualifierTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/ScreenOrientationQualifierTest.java
@@ -18,6 +18,7 @@ package com.android.ide.eclipse.adt.internal.editors.resources.configurations;
 
 import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
 import com.android.ide.eclipse.adt.internal.resources.configurations.ScreenOrientationQualifier;
+import com.android.sdklib.resources.ScreenOrientation;
 
 import junit.framework.TestCase;
 
@@ -43,15 +44,14 @@ public class ScreenOrientationQualifierTest extends TestCase {
     public void testPortrait() {
         assertEquals(true, soq.checkAndSet("port", config)); //$NON-NLS-1$
         assertTrue(config.getScreenOrientationQualifier() != null);
-        assertEquals(ScreenOrientationQualifier.ScreenOrientation.PORTRAIT,
-                config.getScreenOrientationQualifier().getValue());
+        assertEquals(ScreenOrientation.PORTRAIT, config.getScreenOrientationQualifier().getValue());
         assertEquals("port", config.getScreenOrientationQualifier().toString()); //$NON-NLS-1$
     }
 
     public void testLanscape() {
         assertEquals(true, soq.checkAndSet("land", config)); //$NON-NLS-1$
         assertTrue(config.getScreenOrientationQualifier() != null);
-        assertEquals(ScreenOrientationQualifier.ScreenOrientation.LANDSCAPE,
+        assertEquals(ScreenOrientation.LANDSCAPE,
                 config.getScreenOrientationQualifier().getValue());
         assertEquals("land", config.getScreenOrientationQualifier().toString()); //$NON-NLS-1$
     }
@@ -59,7 +59,7 @@ public class ScreenOrientationQualifierTest extends TestCase {
     public void testSquare() {
         assertEquals(true, soq.checkAndSet("square", config)); //$NON-NLS-1$
         assertTrue(config.getScreenOrientationQualifier() != null);
-        assertEquals(ScreenOrientationQualifier.ScreenOrientation.SQUARE,
+        assertEquals(ScreenOrientation.SQUARE,
                 config.getScreenOrientationQualifier().getValue());
         assertEquals("square", config.getScreenOrientationQualifier().toString()); //$NON-NLS-1$
     }
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/TextInputMethodQualifierTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/TextInputMethodQualifierTest.java
index c679295..04eb8da 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/TextInputMethodQualifierTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/TextInputMethodQualifierTest.java
@@ -18,11 +18,12 @@ package com.android.ide.eclipse.adt.internal.editors.resources.configurations;
 
 import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
 import com.android.ide.eclipse.adt.internal.resources.configurations.TextInputMethodQualifier;
+import com.android.sdklib.resources.Keyboard;
 
 import junit.framework.TestCase;
 
 public class TextInputMethodQualifierTest extends TestCase {
-    
+
     private TextInputMethodQualifier timq;
     private FolderConfiguration config;
 
@@ -43,24 +44,21 @@ public class TextInputMethodQualifierTest extends TestCase {
     public void testQuerty() {
         assertEquals(true, timq.checkAndSet("qwerty", config)); //$NON-NLS-1$
         assertTrue(config.getTextInputMethodQualifier() != null);
-        assertEquals(TextInputMethodQualifier.TextInputMethod.QWERTY,
-                config.getTextInputMethodQualifier().getValue());
+        assertEquals(Keyboard.QWERTY, config.getTextInputMethodQualifier().getValue());
         assertEquals("qwerty", config.getTextInputMethodQualifier().toString()); //$NON-NLS-1$
     }
 
     public void test12Key() {
         assertEquals(true, timq.checkAndSet("12key", config)); //$NON-NLS-1$
         assertTrue(config.getTextInputMethodQualifier() != null);
-        assertEquals(TextInputMethodQualifier.TextInputMethod.TWELVEKEYS,
-                config.getTextInputMethodQualifier().getValue());
+        assertEquals(Keyboard.TWELVEKEYS, config.getTextInputMethodQualifier().getValue());
         assertEquals("12key", config.getTextInputMethodQualifier().toString()); //$NON-NLS-1$
     }
 
     public void testNoKey() {
         assertEquals(true, timq.checkAndSet("nokeys", config)); //$NON-NLS-1$
         assertTrue(config.getTextInputMethodQualifier() != null);
-        assertEquals(TextInputMethodQualifier.TextInputMethod.NOKEY,
-                config.getTextInputMethodQualifier().getValue());
+        assertEquals(Keyboard.NOKEY, config.getTextInputMethodQualifier().getValue());
         assertEquals("nokeys", config.getTextInputMethodQualifier().toString()); //$NON-NLS-1$
     }
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/TouchScreenQualifierTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/TouchScreenQualifierTest.java
index b5d7933..209bb57 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/TouchScreenQualifierTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/configurations/TouchScreenQualifierTest.java
@@ -18,6 +18,7 @@ package com.android.ide.eclipse.adt.internal.editors.resources.configurations;
 
 import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
 import com.android.ide.eclipse.adt.internal.resources.configurations.TouchScreenQualifier;
+import com.android.sdklib.resources.TouchScreen;
 
 import junit.framework.TestCase;
 
@@ -43,24 +44,21 @@ public class TouchScreenQualifierTest extends TestCase {
     public void testNoTouch() {
         assertEquals(true, tsq.checkAndSet("notouch", config)); //$NON-NLS-1$
         assertTrue(config.getTouchTypeQualifier() != null);
-        assertEquals(TouchScreenQualifier.TouchScreenType.NOTOUCH,
-                config.getTouchTypeQualifier().getValue());
+        assertEquals(TouchScreen.NOTOUCH, config.getTouchTypeQualifier().getValue());
         assertEquals("notouch", config.getTouchTypeQualifier().toString()); //$NON-NLS-1$
     }
 
     public void testFinger() {
         assertEquals(true, tsq.checkAndSet("finger", config)); //$NON-NLS-1$
         assertTrue(config.getTouchTypeQualifier() != null);
-        assertEquals(TouchScreenQualifier.TouchScreenType.FINGER,
-                config.getTouchTypeQualifier().getValue());
+        assertEquals(TouchScreen.FINGER, config.getTouchTypeQualifier().getValue());
         assertEquals("finger", config.getTouchTypeQualifier().toString()); //$NON-NLS-1$
     }
 
     public void testStylus() {
         assertEquals(true, tsq.checkAndSet("stylus", config)); //$NON-NLS-1$
         assertTrue(config.getTouchTypeQualifier() != null);
-        assertEquals(TouchScreenQualifier.TouchScreenType.STYLUS,
-                config.getTouchTypeQualifier().getValue());
+        assertEquals(TouchScreen.STYLUS, config.getTouchTypeQualifier().getValue());
         assertEquals("stylus", config.getTouchTypeQualifier().toString()); //$NON-NLS-1$
     }
 
@@ -69,5 +67,4 @@ public class TouchScreenQualifierTest extends TestCase {
         assertEquals(false, tsq.checkAndSet("STYLUS", config));//$NON-NLS-1$
         assertEquals(false, tsq.checkAndSet("other", config));//$NON-NLS-1$
     }
-
 }
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java
index 4ce011e..31f9784 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/resources/manager/ConfigMatchTest.java
@@ -18,11 +18,6 @@ package com.android.ide.eclipse.adt.internal.editors.resources.manager;
 
 import com.android.ide.eclipse.adt.internal.resources.configurations.FolderConfiguration;
 import com.android.ide.eclipse.adt.internal.resources.configurations.ResourceQualifier;
-import com.android.ide.eclipse.adt.internal.resources.configurations.KeyboardStateQualifier.KeyboardState;
-import com.android.ide.eclipse.adt.internal.resources.configurations.NavigationMethodQualifier.NavigationMethod;
-import com.android.ide.eclipse.adt.internal.resources.configurations.ScreenOrientationQualifier.ScreenOrientation;
-import com.android.ide.eclipse.adt.internal.resources.configurations.TextInputMethodQualifier.TextInputMethod;
-import com.android.ide.eclipse.adt.internal.resources.configurations.TouchScreenQualifier.TouchScreenType;
 import com.android.ide.eclipse.adt.internal.resources.manager.ProjectResources;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFile;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceFolder;
@@ -35,6 +30,11 @@ import com.android.ide.eclipse.mock.FileMock;
 import com.android.ide.eclipse.mock.FolderMock;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.io.IAbstractFolder;
+import com.android.sdklib.resources.Keyboard;
+import com.android.sdklib.resources.KeyboardState;
+import com.android.sdklib.resources.Navigation;
+import com.android.sdklib.resources.ScreenOrientation;
+import com.android.sdklib.resources.TouchScreen;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -164,10 +164,10 @@ public class ConfigMatchTest extends TestCase {
                 "notlong", // screen ratio
                 ScreenOrientation.LANDSCAPE.getValue(), // screen orientation
                 "mdpi", // dpi
-                TouchScreenType.FINGER.getValue(), // touch mode
+                TouchScreen.FINGER.getValue(), // touch mode
                 KeyboardState.EXPOSED.getValue(), // keyboard state
-                TextInputMethod.QWERTY.getValue(), // text input
-                NavigationMethod.DPAD.getValue(), // navigation
+                Keyboard.QWERTY.getValue(), // text input
+                Navigation.DPAD.getValue(), // navigation
                 "480x320", // screen dimension
                 "v3"); // version
 
@@ -190,10 +190,10 @@ public class ConfigMatchTest extends TestCase {
                 "notlong", // screen ratio
                 ScreenOrientation.LANDSCAPE.getValue(), // screen orientation
                 "mdpi", // dpi
-                TouchScreenType.FINGER.getValue(), // touch mode
+                TouchScreen.FINGER.getValue(), // touch mode
                 KeyboardState.EXPOSED.getValue(), // keyboard state
-                TextInputMethod.QWERTY.getValue(), // text input
-                NavigationMethod.DPAD.getValue(), // navigation
+                Keyboard.QWERTY.getValue(), // text input
+                Navigation.DPAD.getValue(), // navigation
                 "480x320", // screen dimension
                 "v3"); // version