Added status bar qualifier to device schema

Since some tablets have a status bar at the top and others don't, we
need to be able to configure this by API level for the GLE.

Change-Id: I8c4fd7adb89636173421489f8a136d541d3de4eb

9 files changed, 19 insertions, 2 deletions

diff --git a/device_validator/app/src/com/android/validator/DeviceValidator.java b/device_validator/app/src/com/android/validator/DeviceValidator.java
index e4038bc..8ca6afe 100644
--- a/device_validator/app/src/com/android/validator/DeviceValidator.java
+++ b/device_validator/app/src/com/android/validator/DeviceValidator.java
@@ -16,12 +16,12 @@
 
 package com.android.validator;
 
+import com.android.dvlib.DeviceSchema;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 
-import com.android.dvlib.DeviceSchema;
-
 public class DeviceValidator {
 
     public static void main(String[] args) {
diff --git a/device_validator/dvlib/src/com/android/dvlib/DeviceSchema.java b/device_validator/dvlib/src/com/android/dvlib/DeviceSchema.java
index 6c45401..b02471b 100644
--- a/device_validator/dvlib/src/com/android/dvlib/DeviceSchema.java
+++ b/device_validator/dvlib/src/com/android/dvlib/DeviceSchema.java
@@ -90,6 +90,8 @@ public class DeviceSchema {
 
     public static final String NODE_LIVE_WALLPAPER_SUPPORT = "live-wallpaper-support";
 
+    public static final String NODE_STATUS_BAR = "status-bar";
+
     public static final String NODE_BUTTONS = "buttons";
 
     public static final String NODE_CAMERA = "camera";
diff --git a/device_validator/dvlib/src/com/android/dvlib/devices.xsd b/device_validator/dvlib/src/com/android/dvlib/devices.xsd
index 0cc9411..d4678da 100644
--- a/device_validator/dvlib/src/com/android/dvlib/devices.xsd
+++ b/device_validator/dvlib/src/com/android/dvlib/devices.xsd
@@ -206,6 +206,14 @@
                     <xsd:list itemType="xsd:NMTOKEN" />
                 </xsd:simpleType>
             </xsd:element>
+            <xsd:element name="status-bar" type="xsd:boolean">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">
+                        Specifies whether the device has a status bar in this
+                        software configuration.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
         </xsd:sequence>
     </xsd:complexType>
 
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 b626012..6662099 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices.xml
+++ b/device_validator/dvlib/tests/src/com/android/dvlib/devices.xml
@@ -123,6 +123,7 @@
                 GL_OES_vertex_array_object
                 GL_OES_vertex_half_float
             </d:gl-extensions>
+            <d:status-bar>true</d:status-bar>
         </d:software>
         <d:state name="Portrait" default="true">
             <d:description>The phone in portrait view</d:description>
@@ -248,6 +249,7 @@
                 GL_IMG_texture_stream
                 GL_IMG_vertex_program
             </d:gl-extensions>
+            <d:status-bar>true</d:status-bar>
         </d:software>
         <d:state name="Portrait" default="true">
             <d:description>The phone in portrait view</d:description>
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 20d501f..e063fd1 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
@@ -117,6 +117,7 @@
                 GL_OES_vertex_array_object
                 GL_OES_vertex_half_float
             </d:gl-extensions>
+            <d:status-bar>true</d:status-bar>
         </d:software>
         <d:state name="Portrait" default="true">
             <d:description>The phone in portrait view</d:description>
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 1247a45..605a6c1 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
@@ -122,6 +122,7 @@
                 GL_OES_vertex_array_object
                 GL_OES_vertex_half_float
             </d:gl-extensions>
+            <d:status-bar>true</d:status-bar>
         </d:software>
         <d:state name="Portrait">
             <d:description>The phone in portrait view</d:description>
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 8f189a4..fb133ad 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
@@ -63,6 +63,7 @@
                 GL_OES_vertex_array_object
                 GL_OES_vertex_half_float
             </d:gl-extensions>
+            <d:status-bar>true</d:status-bar>
         </d:software>
         <d:state name="Portrait" default="true">
             <d:description>The phone in portrait view</d:description>
diff --git a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_states.xml b/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_states.xml
index 89519cf..8685e3b 100644
--- a/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_states.xml
+++ b/device_validator/dvlib/tests/src/com/android/dvlib/devices_no_states.xml
@@ -123,6 +123,7 @@
                 GL_OES_vertex_array_object
                 GL_OES_vertex_half_float
             </d:gl-extensions>
+            <d:status-bar>true</d:status-bar>
         </d:software>
     </d:device>
 </d:devices>
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 5409d32..c720a7a 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
@@ -123,6 +123,7 @@
                 GL_OES_vertex_array_object
                 GL_OES_vertex_half_float
             </d:gl-extensions>
+            <d:status-bar>true</d:status-bar>
         </d:software>
         <d:state name="Portrait" default="true">
             <d:description>The phone in portrait view</d:description>