Fixed schema to match resource qualifiers

Change-Id: Icede9eaaf0a38924397e7ea49775a6aef9701391

7 files changed, 16 insertions, 16 deletions

diff --git a/device_validator/dvlib/src/com/android/dvlib/devices.xsd b/device_validator/dvlib/src/com/android/dvlib/devices.xsd
index 7e93fd5..0cc9411 100644
--- a/device_validator/dvlib/src/com/android/dvlib/devices.xsd
+++ b/device_validator/dvlib/src/com/android/dvlib/devices.xsd
@@ -240,8 +240,8 @@
                 </xsd:annotation>
                 <xsd:simpleType>
                     <xsd:restriction base="xsd:token">
-                        <xsd:enumeration value="portrait" />
-                        <xsd:enumeration value="landscape" />
+                        <xsd:enumeration value="port" />
+                        <xsd:enumeration value="land" />
                         <xsd:enumeration value="square" />
                     </xsd:restriction>
                 </xsd:simpleType>
@@ -846,7 +846,7 @@
             <xsd:simpleType>
                 <xsd:restriction base="xsd:token">
                     <xsd:enumeration value="desk" />
-                    <xsd:enumeration value="tv" />
+                    <xsd:enumeration value="television" />
                     <xsd:enumeration value="car" />
                 </xsd:restriction>
             </xsd:simpleType>
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices.xml b/device_validator/dvlib/tests/src/com/android/dvlib/devices.xml
index 6920e97..b626012 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices.xml
+++ b/device_validator/dvlib/tests/src/com/android/dvlib/devices.xml
@@ -126,13 +126,13 @@
         </d:software>
         <d:state name="Portrait" default="true">
             <d:description>The phone in portrait view</d:description>
-            <d:screen-orientation>portrait</d:screen-orientation>
+            <d:screen-orientation>port</d:screen-orientation>
             <d:keyboard-state>keyssoft</d:keyboard-state>
             <d:nav-state>nonav</d:nav-state>
         </d:state>
         <d:state name="Landscape">
             <d:description>The phone in landscape view</d:description>
-            <d:screen-orientation>landscape</d:screen-orientation>
+            <d:screen-orientation>land</d:screen-orientation>
             <d:keyboard-state>keyssoft</d:keyboard-state>
             <d:nav-state>nonav</d:nav-state>
         </d:state>
@@ -251,19 +251,19 @@
         </d:software>
         <d:state name="Portrait" default="true">
             <d:description>The phone in portrait view</d:description>
-            <d:screen-orientation>portrait</d:screen-orientation>
+            <d:screen-orientation>port</d:screen-orientation>
             <d:keyboard-state>keyshidden</d:keyboard-state>
             <d:nav-state>navhidden</d:nav-state>
         </d:state>
         <d:state name="Landscape, closed">
             <d:description>The phone in landscape view with the keyboard closed</d:description>
-            <d:screen-orientation>landscape</d:screen-orientation>
+            <d:screen-orientation>land</d:screen-orientation>
             <d:keyboard-state>keyshidden</d:keyboard-state>
             <d:nav-state>navhidden</d:nav-state>
         </d:state>
         <d:state name="Landscape, open">
             <d:description>The phone in landscape view with the keyboard open</d:description>
-            <d:screen-orientation>landscape</d:screen-orientation>
+            <d:screen-orientation>land</d:screen-orientation>
             <d:keyboard-state>keysexposed</d:keyboard-state>
             <d:nav-state>navexposed</d:nav-state>
         </d:state>
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_minimal.xml b/device_validator/dvlib/tests/src/com/android/dvlib/devices_minimal.xml
index e50f636..20d501f 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_minimal.xml
+++ b/device_validator/dvlib/tests/src/com/android/dvlib/devices_minimal.xml
@@ -120,13 +120,13 @@
         </d:software>
         <d:state name="Portrait" default="true">
             <d:description>The phone in portrait view</d:description>
-            <d:screen-orientation>portrait</d:screen-orientation>
+            <d:screen-orientation>port</d:screen-orientation>
             <d:keyboard-state>keyssoft</d:keyboard-state>
             <d:nav-state>nonav</d:nav-state>
         </d:state>
         <d:state name="Landscape">
             <d:description>The phone in landscape view</d:description>
-            <d:screen-orientation>landscape</d:screen-orientation>
+            <d:screen-orientation>land</d:screen-orientation>
             <d:keyboard-state>keyssoft</d:keyboard-state>
             <d:nav-state>nonav</d:nav-state>
         </d:state>
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_default.xml b/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_default.xml
index f6d9bcd..1247a45 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_default.xml
+++ b/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_default.xml
@@ -125,7 +125,7 @@
         </d:software>
         <d:state name="Portrait">
             <d:description>The phone in portrait view</d:description>
-            <d:screen-orientation>portrait</d:screen-orientation>
+            <d:screen-orientation>port</d:screen-orientation>
             <d:keyboard-state>keyssoft</d:keyboard-state>
             <d:nav-state>nonav</d:nav-state>
         </d:state>
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_hardware.xml b/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_hardware.xml
index a5c3da1..8f189a4 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_hardware.xml
+++ b/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_hardware.xml
@@ -66,13 +66,13 @@
         </d:software>
         <d:state name="Portrait" default="true">
             <d:description>The phone in portrait view</d:description>
-            <d:screen-orientation>portrait</d:screen-orientation>
+            <d:screen-orientation>port</d:screen-orientation>
             <d:keyboard-state>keyssoft</d:keyboard-state>
             <d:nav-state>nonav</d:nav-state>
         </d:state>
         <d:state name="Landscape">
             <d:description>The phone in landscape view</d:description>
-            <d:screen-orientation>landscape</d:screen-orientation>
+            <d:screen-orientation>land</d:screen-orientation>
             <d:keyboard-state>keyssoft</d:keyboard-state>
             <d:nav-state>nonav</d:nav-state>
         </d:state>
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_software.xml b/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_software.xml
index 9c3764e..ae709bb 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_software.xml
+++ b/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_software.xml
@@ -72,7 +72,7 @@
         </d:hardware>
         <d:state name="Portrait" default="true">
             <d:description>The phone in portrait view</d:description>
-            <d:screen-orientation>portrait</d:screen-orientation>
+            <d:screen-orientation>port</d:screen-orientation>
             <d:keyboard-state>keyssoft</d:keyboard-state>
             <d:nav-state>nonav</d:nav-state>
         </d:state>
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_too_many_defaults.xml b/device_validator/dvlib/tests/src/com/android/dvlib/devices_too_many_defaults.xml
index adf544a..5409d32 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_too_many_defaults.xml
+++ b/device_validator/dvlib/tests/src/com/android/dvlib/devices_too_many_defaults.xml
@@ -126,13 +126,13 @@
         </d:software>
         <d:state name="Portrait" default="true">
             <d:description>The phone in portrait view</d:description>
-            <d:screen-orientation>portrait</d:screen-orientation>
+            <d:screen-orientation>port</d:screen-orientation>
             <d:keyboard-state>keyssoft</d:keyboard-state>
             <d:nav-state>nonav</d:nav-state>
         </d:state>
         <d:state name="Landscape" default="true">
             <d:description>The phone in landscape view</d:description>
-            <d:screen-orientation>landscape</d:screen-orientation>
+            <d:screen-orientation>land</d:screen-orientation>
             <d:keyboard-state>keyssoft</d:keyboard-state>
             <d:nav-state>nonav</d:nav-state>
         </d:state>