Update devices.xml shipped with tools

Rather than containing the generic devices which are now packaged with
ADT itself, it contains the nexus devices using the new device
specification.

Change-Id: I09b38b8166ba558800c2cf03150d8a3e9dd33a4f

1 files changed, 381 insertions, 426 deletions

diff --git a/files/devices.xml b/files/devices.xml
index c9eb890..ec8d936 100644
--- a/files/devices.xml
+++ b/files/devices.xml
@@ -1,452 +1,407 @@
-<?xml version="1.0"?>
-<d:layout-devices
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:d="http://schemas.android.com/sdk/android/layout-devices/1">
+<?xml version="1.0" encoding="UTF-8"?>
 
-    <d:device name="2.7in QVGA">
-        <d:default>
-            <d:screen-size>small</d:screen-size>
-            <d:screen-ratio>notlong</d:screen-ratio>
-            <d:screen-orientation>port</d:screen-orientation>
-            <d:pixel-density>ldpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
-            <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:text-input-method>nokeys</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>nonav</d:nav-method>
-            <d:screen-dimension>
-                <d:size>240</d:size>
-                <d:size>320</d:size>
-            </d:screen-dimension>
-            <d:xdpi>145</d:xdpi>
-            <d:ydpi>145</d:ydpi>
-        </d:default>
-
-        <d:config name="Portrait">
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape">
-            <d:screen-orientation>land</d:screen-orientation>
-        </d:config>
-    </d:device>
+<d:devices xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns:d="http://schemas.android.com/sdk/devices/1">
 
-    <d:device name="2.7in QVGA slider">
-        <d:default>
-            <d:screen-size>small</d:screen-size>
-            <d:screen-ratio>notlong</d:screen-ratio>
+    <d:device>
+        <d:name>Nexus One</d:name>
+        <d:manufacturer>HTC</d:manufacturer>
+        <d:hardware>
+            <d:screen>
+                <d:screen-size>normal</d:screen-size>
+                <d:diagonal-length>3.7</d:diagonal-length>
+                <d:pixel-density>hdpi</d:pixel-density>
+                <d:screen-ratio>long</d:screen-ratio>
+                <d:dimensions>
+                    <d:x-dimension>480</d:x-dimension>
+                    <d:y-dimension>720</d:y-dimension>
+                </d:dimensions>
+                <d:xdpi>254</d:xdpi>
+                <d:ydpi>254</d:ydpi>
+                <d:touch>
+                    <d:multitouch>basic</d:multitouch>
+                    <d:mechanism>finger</d:mechanism>
+                    <d:screen-type>capacitive</d:screen-type>
+                </d:touch>
+            </d:screen>
+            <d:networking>
+                Wifi
+                Bluetooth
+            </d:networking>
+            <d:sensors>
+                Accelerometer
+                Compass
+                GPS
+                LightSensor
+                ProximitySensor
+            </d:sensors>
+            <d:mic>true</d:mic>
+            <d:camera>
+                <d:location>back</d:location>
+                <d:autofocus>true</d:autofocus>
+                <d:flash>true</d:flash>
+            </d:camera>
+            <d:keyboard>nokeys</d:keyboard>
+            <d:nav>trackball</d:nav>
+            <d:ram unit="MiB">512</d:ram>
+            <d:buttons>hard</d:buttons>
+            <d:internal-storage unit="MiB">503</d:internal-storage>
+            <d:removable-storage unit="MiB">0</d:removable-storage>
+            <d:cpu>Qualcomm Scorpion</d:cpu>
+            <d:gpu>Qualcomm Adreno 200</d:gpu>
+            <d:abi>
+                armeabi-v7a
+                armeabi
+            </d:abi>
+            <d:dock> </d:dock>
+            <d:power-type>plugged-in</d:power-type>
+        </d:hardware>
+        <d:software>
+            <d:api-level>7-10</d:api-level>
+            <d:live-wallpaper-support>true</d:live-wallpaper-support>
+            <d:bluetooth-profiles> </d:bluetooth-profiles>
+            <d:gl-version>2.0</d:gl-version>
+            <d:gl-extensions>
+            </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>
             <d:screen-orientation>port</d:screen-orientation>
-            <d:pixel-density>ldpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
-            <d:text-input-method>qwerty</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>nonav</d:nav-method>
-            <d:screen-dimension>
-                <d:size>240</d:size>
-                <d:size>320</d:size>
-            </d:screen-dimension>
-            <d:xdpi>145</d:xdpi>
-            <d:ydpi>145</d:ydpi>
-        </d:default>
-
-        <d:config name="Portrait">
-            <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape, closed">
             <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>land</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape, open">
-            <d:keyboard-state>keysexposed</d:keyboard-state>
-            <d:screen-orientation>land</d:screen-orientation>
-        </d:config>
-    </d:device>
-
-    <d:device name="3.2in HVGA slider (ADP1)">
-        <d:default>
-            <d:screen-size>normal</d:screen-size>
-            <d:screen-ratio>notlong</d:screen-ratio>
-            <d:screen-orientation>port</d:screen-orientation>
-            <d:pixel-density>mdpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
-            <d:text-input-method>qwerty</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>trackball</d:nav-method>
-            <d:screen-dimension>
-                <d:size>320</d:size>
-                <d:size>480</d:size>
-            </d:screen-dimension>
-            <d:xdpi>180.6</d:xdpi>
-            <d:ydpi>182</d:ydpi>
-        </d:default>
-
-        <d:config name="Portrait">
-            <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape, closed">
             <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:screen-orientation>land</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape, open">
-            <d:keyboard-state>keysexposed</d:keyboard-state>
-            <d:screen-orientation>land</d:screen-orientation>
-        </d:config>
-    </d:device>
-
-    <d:device name="3.2in HVGA (ADP2)">
-        <d:default>
-            <d:screen-size>normal</d:screen-size>
-            <d:screen-ratio>notlong</d:screen-ratio>
-            <d:screen-orientation>port</d:screen-orientation>
-            <d:pixel-density>mdpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
-            <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:text-input-method>nokeys</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>trackball</d:nav-method>
-            <d:screen-dimension>
-                <d:size>320</d:size>
-                <d:size>480</d:size>
-            </d:screen-dimension>
-            <d:xdpi>180.6</d:xdpi>
-            <d:ydpi>182</d:ydpi>
-        </d:default>
-
-        <d:config name="Portrait">
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape">
-            <d:screen-orientation>land</d:screen-orientation>
-        </d:config>
+            <d:nav-state>nonav</d:nav-state>
+        </d:state>
     </d:device>
-
-    <d:device name="3.3in WQVGA">
-        <d:default>
-            <d:screen-size>normal</d:screen-size>
-            <d:screen-ratio>long</d:screen-ratio>
+    <d:device>
+        <d:name>Nexus S</d:name>
+        <d:manufacturer>Samsung</d:manufacturer>
+        <d:hardware>
+            <d:screen>
+                <d:screen-size>normal</d:screen-size>
+                <d:diagonal-length>4</d:diagonal-length>
+                <d:pixel-density>hdpi</d:pixel-density>
+                <d:screen-ratio>long</d:screen-ratio>
+                <d:dimensions>
+                    <d:x-dimension>480</d:x-dimension>
+                    <d:y-dimension>800</d:y-dimension>
+                </d:dimensions>
+                <d:xdpi>235</d:xdpi>
+                <d:ydpi>235</d:ydpi>
+                <d:touch>
+                    <d:multitouch>jazz-hands</d:multitouch>
+                    <d:mechanism>finger</d:mechanism>
+                    <d:screen-type>capacitive</d:screen-type>
+                </d:touch>
+            </d:screen>
+            <d:networking>
+                Wifi
+                Bluetooth
+                NFC
+            </d:networking>
+            <d:sensors>
+                Accelerometer
+                Compass
+                GPS
+                Gyroscope
+                LightSensor
+                ProximitySensor
+            </d:sensors>
+            <d:mic>true</d:mic>
+            <d:camera>
+                <d:location>back</d:location>
+                <d:autofocus>true</d:autofocus>
+                <d:flash>true</d:flash>
+            </d:camera>
+            <d:camera>
+                <d:location>front</d:location>
+                <d:autofocus>false</d:autofocus>
+                <d:flash>false</d:flash>
+            </d:camera>
+            <d:keyboard>nokeys</d:keyboard>
+            <d:nav>nonav</d:nav>
+            <d:ram unit="KiB">351428</d:ram>
+            <d:buttons>hard</d:buttons>
+            <d:internal-storage unit="MiB">503</d:internal-storage>
+            <d:removable-storage unit="MiB">0</d:removable-storage>
+            <d:cpu>Samsung Exynos 3110</d:cpu>
+            <d:gpu>PowerVR SGX 540</d:gpu>
+            <d:abi>
+                armeabi-v7a
+                armeabi
+            </d:abi>
+            <d:dock> </d:dock>
+            <d:power-type>plugged-in</d:power-type>
+        </d:hardware>
+        <d:software>
+            <d:api-level>9-16</d:api-level>
+            <d:live-wallpaper-support>true</d:live-wallpaper-support>
+            <d:bluetooth-profiles> </d:bluetooth-profiles>
+            <d:gl-version>2.0</d:gl-version>
+            <d:gl-extensions>
+                GL_EXT_debug_marker
+                GL_OES_rgb8_rgba8
+                GL_OES_depth24
+                GL_OES_vertex_half_float
+                GL_OES_texture_float
+                GL_OES_texture_half_float
+                GL_OES_element_index_uint
+                GL_OES_mapbuffer
+                GL_OES_fragment_precision_high
+                GL_OES_compressed_ETC1_RGB8_texture
+                GL_OES_EGL_image
+                GL_OES_EGL_image_external
+                GL_OES_required_internalformat
+                GL_OES_depth_texture
+                GL_OES_get_program_binary
+                GL_OES_packed_depth_stencil
+                GL_OES_standard_derivatives
+                GL_OES_vertex_array_object
+                GL_OES_egl_sync
+                GL_EXT_multi_draw_arrays
+                GL_EXT_texture_format_BGRA8888
+                GL_EXT_discard_framebuffer
+                GL_EXT_shader_texture_lod
+                GL_IMG_shader_binary
+                GL_IMG_texture_compression_pvrtc
+                GL_IMG_texture_npot
+                GL_IMG_texture_format_BGRA8888
+                GL_IMG_read_format
+                GL_IMG_program_binary
+                GL_IMG_multisampled_render_to_texture
+            </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>
             <d:screen-orientation>port</d:screen-orientation>
-            <d:pixel-density>ldpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
             <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:text-input-method>nokeys</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>nonav</d:nav-method>
-            <d:screen-dimension>
-                <d:size>240</d:size>
-                <d:size>400</d:size>
-            </d:screen-dimension>
-            <d:xdpi>141</d:xdpi>
-            <d:ydpi>141</d:ydpi>
-        </d:default>
-
-        <d:config name="Portrait">
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape">
+            <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>land</d:screen-orientation>
-        </d:config>
-    </d:device>
-    <d:device name="3.4in FWQVGA">
-        <d:default>
-            <d:screen-size>normal</d:screen-size>
-            <d:screen-ratio>long</d:screen-ratio>
-            <d:screen-orientation>port</d:screen-orientation>
-            <d:pixel-density>ldpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
             <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:text-input-method>nokeys</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>nonav</d:nav-method>
-            <d:screen-dimension>
-                <d:size>240</d:size>
-                <d:size>432</d:size>
-            </d:screen-dimension>
-            <d:xdpi>145</d:xdpi>
-            <d:ydpi>145</d:ydpi>
-        </d:default>
-
-        <d:config name="Portrait">
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape">
-            <d:screen-orientation>land</d:screen-orientation>
-        </d:config>
+            <d:nav-state>nonav</d:nav-state>
+        </d:state>
     </d:device>
 
-    <d:device name="3.7in WVGA (Nexus One)">
-        <d:default>
-            <d:screen-size>normal</d:screen-size>
-            <d:screen-ratio>long</d:screen-ratio>
+    <d:device>
+        <d:name>
+            Galaxy Nexus
+        </d:name>
+        <d:manufacturer>
+            Samsung
+        </d:manufacturer>
+        <d:hardware>
+            <d:screen>
+                <d:screen-size>normal</d:screen-size>
+                <d:diagonal-length>4.65</d:diagonal-length> <!-- In inches -->
+                <d:pixel-density>xhdpi</d:pixel-density>
+                <d:screen-ratio>long</d:screen-ratio>
+                <d:dimensions>
+                    <d:x-dimension>720</d:x-dimension>
+                    <d:y-dimension>1280</d:y-dimension>
+                </d:dimensions>
+                <d:xdpi>316</d:xdpi>
+                <d:ydpi>316</d:ydpi>
+                <d:touch>
+                    <d:multitouch>jazz-hands</d:multitouch>
+                    <d:mechanism>finger</d:mechanism>
+                    <d:screen-type>capacitive</d:screen-type>
+                </d:touch>
+            </d:screen>
+            <d:networking>
+                Bluetooth
+                Wifi
+                NFC
+            </d:networking>
+            <d:sensors>
+                Accelerometer
+                Barometer
+                Gyroscope
+                Compass
+                GPS
+                ProximitySensor
+            </d:sensors>
+            <d:mic>true</d:mic>
+            <d:camera>
+                <d:location>front</d:location>
+                <d:autofocus>true</d:autofocus>
+                <d:flash>false</d:flash>
+            </d:camera>
+            <d:camera>
+                <d:location>back</d:location>
+                <d:autofocus>true</d:autofocus>
+                <d:flash>true</d:flash>
+            </d:camera>
+            <d:keyboard>nokeys</d:keyboard>
+            <d:nav>nonav</d:nav>
+            <d:ram unit="GiB">1</d:ram>
+            <d:buttons>soft</d:buttons>
+            <d:internal-storage unit="GiB">16</d:internal-storage>
+            <d:removable-storage unit="KiB"></d:removable-storage>
+            <d:cpu>OMAP 4460</d:cpu> <!-- cpu type (Tegra3) freeform -->
+            <d:gpu>PowerVR SGX540</d:gpu>
+            <d:abi>
+                armeabi
+                armeabi-v7a
+            </d:abi>
+            <!--dock (car, desk, tv, none)-->
+            <d:dock>
+            </d:dock>
+            <!-- plugged in (never, charge, always) -->
+            <d:power-type>battery</d:power-type>
+        </d:hardware>
+        <d:software>
+            <d:api-level>14-</d:api-level>
+            <d:live-wallpaper-support>true</d:live-wallpaper-support>
+            <d:bluetooth-profiles>
+                HSP
+                HFP
+                SPP
+                A2DP
+                AVRCP
+                OPP
+                PBAP
+                GAVDP
+                AVDTP
+                HID
+                HDP
+                PAN
+            </d:bluetooth-profiles>
+            <d:gl-version>2.0</d:gl-version>
+            <!--
+             These can be gotten via
+             javax.microedition.khronos.opengles.GL10.glGetString(GL10.GL_EXTENSIONS);
+            -->
+            <d:gl-extensions>
+                GL_EXT_discard_framebuffer
+                GL_EXT_multi_draw_arrays
+                GL_EXT_shader_texture_lod
+                GL_EXT_texture_format_BGRA8888
+                GL_IMG_multisampled_render_to_texture
+                GL_IMG_program_binary
+                GL_IMG_read_format
+                GL_IMG_shader_binary
+                GL_IMG_texture_compression_pvrtc
+                GL_IMG_texture_format_BGRA8888
+                GL_IMG_texture_npot
+                GL_OES_compressed_ETC1_RGB8_texture
+                GL_OES_depth_texture
+                GL_OES_depth24
+                GL_OES_EGL_image
+                GL_OES_EGL_image_external
+                GL_OES_egl_sync
+                GL_OES_element_index_uint
+                GL_OES_fragment_precision_high
+                GL_OES_get_program_binary
+                GL_OES_mapbuffer
+                GL_OES_packed_depth_stencil
+                GL_OES_required_internalformat
+                GL_OES_rgb8_rgba8
+                GL_OES_standard_derivatives
+                GL_OES_texture_float
+                GL_OES_texture_half_float
+                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>
             <d:screen-orientation>port</d:screen-orientation>
-            <d:pixel-density>hdpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
             <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:text-input-method>nokeys</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>trackball</d:nav-method>
-            <d:screen-dimension>
-                <d:size>480</d:size>
-                <d:size>800</d:size>
-            </d:screen-dimension>
-            <d:xdpi>254</d:xdpi>
-            <d:ydpi>254</d:ydpi>
-        </d:default>
-
-        <d:config name="Portrait">
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape">
+            <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>land</d:screen-orientation>
-        </d:config>
-    </d:device>
-
-    <d:device name="3.7in FWVGA slider">
-        <d:default>
-            <d:screen-size>normal</d:screen-size>
-            <d:screen-ratio>long</d:screen-ratio>
-            <d:screen-orientation>port</d:screen-orientation>
-            <d:pixel-density>hdpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
-            <d:text-input-method>qwerty</d:text-input-method>
-            <d:nav-state>navhidden</d:nav-state>
-            <d:nav-method>dpad</d:nav-method>
-            <d:screen-dimension>
-                <d:size>480</d:size>
-                <d:size>854</d:size>
-            </d:screen-dimension>
-            <d:xdpi>265</d:xdpi>
-            <d:ydpi>265</d:ydpi>
-        </d:default>
-
-        <d:config name="Portrait">
-            <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape, closed">
             <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:screen-orientation>land</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape, open">
-            <d:keyboard-state>keysexposed</d:keyboard-state>
-            <d:screen-orientation>land</d:screen-orientation>
-            <d:nav-state>navexposed</d:nav-state>
-        </d:config>
+            <d:nav-state>nonav</d:nav-state>
+        </d:state>
     </d:device>
+    <d:device>
+        <d:name>Nexus 7</d:name>
+        <d:manufacturer>Asus</d:manufacturer>
+        <d:hardware>
+            <d:screen>
+                <d:screen-size>large</d:screen-size>
+                <d:diagonal-length>7.27</d:diagonal-length>
+                <d:pixel-density>tvdpi</d:pixel-density>
+                <d:screen-ratio>notlong</d:screen-ratio>
+                <d:dimensions>
+                    <d:x-dimension>800</d:x-dimension>
+                    <d:y-dimension>1280</d:y-dimension>
+                </d:dimensions>
+                <d:xdpi>195</d:xdpi>
+                <d:ydpi>200</d:ydpi>
+                <d:touch>
+                    <d:multitouch>jazz-hands</d:multitouch>
+                    <d:mechanism>finger</d:mechanism>
+                    <d:screen-type>capacitive</d:screen-type>
+                </d:touch>
+            </d:screen>
+            <d:networking>
+                Wifi
+                Bluetooth
+                NFC
+            </d:networking>
+            <d:sensors>
+                Accelerometer
+                Compass
+                GPS
+                Gyroscope
+                LightSensor
+            </d:sensors>
+            <d:mic>true</d:mic>
+            <d:camera>
+                <d:location>front</d:location>
+                <d:autofocus>false</d:autofocus>
+                <d:flash>false</d:flash>
+            </d:camera>
+            <d:keyboard>nokeys</d:keyboard>
+            <d:nav>nonav</d:nav>
+            <d:ram unit="GiB">1</d:ram>
+            <d:buttons>soft</d:buttons>
+            <d:internal-storage unit="GiB">8</d:internal-storage>
+            <d:removable-storage unit="MiB"> </d:removable-storage>
+            <d:cpu> Tegra3 </d:cpu>
+            <d:gpu> Tegra3 </d:gpu>
+            <d:abi>
+                armeabi-v7a
+                armeabi
+            </d:abi>
+            <d:dock> </d:dock>
+            <d:power-type>battery</d:power-type>
+        </d:hardware>
 
-    <d:device name="4in WVGA (Nexus S)">
-        <d:default>
-            <d:screen-size>normal</d:screen-size>
-            <d:screen-ratio>long</d:screen-ratio>
-            <d:screen-orientation>port</d:screen-orientation>
-            <d:pixel-density>hdpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
-            <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:text-input-method>nokeys</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>nonav</d:nav-method>
-            <d:screen-dimension>
-                <d:size>480</d:size>
-                <d:size>800</d:size>
-            </d:screen-dimension>
-            <d:xdpi>235</d:xdpi>
-            <d:ydpi>235</d:ydpi>
-        </d:default>
+        <d:software>
+            <d:api-level>16</d:api-level>
+            <d:live-wallpaper-support>true</d:live-wallpaper-support>
+            <d:bluetooth-profiles> </d:bluetooth-profiles>
+            <d:gl-version>2.0</d:gl-version>
+            <d:gl-extensions> </d:gl-extensions>
+            <d:status-bar>true</d:status-bar>
+        </d:software>
 
-        <d:config name="Portrait">
+        <d:state name="Portrait" default="true">
+            <d:description>The phone in portrait view</d:description>
             <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape">
-            <d:screen-orientation>land</d:screen-orientation>
-        </d:config>
-    </d:device>
-
-    <d:device name="4.65in 720p (Galaxy Nexus)">
-        <d:default>
-            <d:screen-size>normal</d:screen-size>
-            <d:screen-ratio>long</d:screen-ratio>
-            <d:screen-orientation>port</d:screen-orientation>
-            <d:pixel-density>xhdpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
             <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:text-input-method>nokeys</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>nonav</d:nav-method>
-            <d:screen-dimension>
-                <d:size>720</d:size>
-                <d:size>1280</d:size>
-            </d:screen-dimension>
-            <d:xdpi>316</d:xdpi>
-            <d:ydpi>316</d:ydpi>
-        </d:default>
-
-        <d:config name="Portrait">
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape">
+            <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>land</d:screen-orientation>
-        </d:config>
-    </d:device>
-
-    <d:device name="4.7in WXGA">
-        <d:default>
-            <d:screen-size>normal</d:screen-size>
-            <d:screen-ratio>long</d:screen-ratio>
-            <d:screen-orientation>port</d:screen-orientation>
-            <d:pixel-density>xhdpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
             <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:text-input-method>nokeys</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>nonav</d:nav-method>
-            <d:screen-dimension>
-                <d:size>1280</d:size>
-                <d:size>720</d:size>
-            </d:screen-dimension>
-            <d:xdpi>320</d:xdpi>
-            <d:ydpi>320</d:ydpi>
-        </d:default>
-
-        <d:config name="Portrait">
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape">
-            <d:screen-orientation>land</d:screen-orientation>
-        </d:config>
-    </d:device>
+            <d:nav-state>nonav</d:nav-state>
+        </d:state>
 
-    <d:device name="5.1in WVGA">
-        <d:default>
-            <d:screen-size>large</d:screen-size>
-            <d:screen-ratio>long</d:screen-ratio>
-            <d:screen-orientation>port</d:screen-orientation>
-            <d:pixel-density>mdpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
-            <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:text-input-method>nokeys</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>nonav</d:nav-method>
-            <d:screen-dimension>
-                <d:size>480</d:size>
-                <d:size>800</d:size>
-            </d:screen-dimension>
-            <d:xdpi>183</d:xdpi>
-            <d:ydpi>183</d:ydpi>
-        </d:default>
-
-        <d:config name="Portrait">
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape">
-            <d:screen-orientation>land</d:screen-orientation>
-        </d:config>
-    </d:device>
-
-    <d:device name="5.4in FWVGA">
-        <d:default>
-            <d:screen-size>large</d:screen-size>
-            <d:screen-ratio>long</d:screen-ratio>
-            <d:screen-orientation>port</d:screen-orientation>
-            <d:pixel-density>mdpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
-            <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:text-input-method>nokeys</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>nonav</d:nav-method>
-            <d:screen-dimension>
-                <d:size>480</d:size>
-                <d:size>854</d:size>
-            </d:screen-dimension>
-            <d:xdpi>181</d:xdpi>
-            <d:ydpi>181</d:ydpi>
-        </d:default>
-
-        <d:config name="Portrait">
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-        <d:config name="Landscape">
-            <d:screen-orientation>land</d:screen-orientation>
-        </d:config>
-    </d:device>
-
-    <d:device name="7in WSVGA (Tablet)">
-        <d:default>
-            <d:screen-size>large</d:screen-size>
-            <d:screen-ratio>long</d:screen-ratio>
-            <d:screen-orientation>land</d:screen-orientation>
-            <d:pixel-density>mdpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
-            <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:text-input-method>nokeys</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>nonav</d:nav-method>
-            <d:screen-dimension>
-                <d:size>1024</d:size>
-                <d:size>600</d:size>
-            </d:screen-dimension>
-            <d:xdpi>169</d:xdpi>
-            <d:ydpi>169</d:ydpi>
-        </d:default>
-
-        <d:config name="Landscape">
-            <d:screen-orientation>land</d:screen-orientation>
-        </d:config>
-        <d:config name="Portrait">
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-    </d:device>
-
-    <d:device name="7in WXGA (Nexus 7)">
-        <d:default>
-            <d:screen-size>large</d:screen-size>
-            <d:screen-ratio>long</d:screen-ratio>
-            <d:screen-orientation>land</d:screen-orientation>
-            <d:pixel-density>tvdpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
-            <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:text-input-method>nokeys</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>nonav</d:nav-method>
-            <d:screen-dimension>
-                <d:size>1280</d:size>
-                <d:size>800</d:size>
-            </d:screen-dimension>
-            <d:xdpi>195</d:xdpi>
-            <d:ydpi>200</d:ydpi>
-        </d:default>
-
-        <d:config name="Landscape">
-            <d:screen-orientation>land</d:screen-orientation>
-        </d:config>
-        <d:config name="Portrait">
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
-    </d:device>
-
-    <d:device name="10.1in WXGA (Tablet)">
-        <d:default>
-            <d:screen-size>xlarge</d:screen-size>
-            <d:screen-ratio>long</d:screen-ratio>
-            <d:screen-orientation>land</d:screen-orientation>
-            <d:pixel-density>mdpi</d:pixel-density>
-            <d:touch-type>finger</d:touch-type>
-            <d:keyboard-state>keyssoft</d:keyboard-state>
-            <d:text-input-method>nokeys</d:text-input-method>
-            <d:nav-state>navexposed</d:nav-state>
-            <d:nav-method>nonav</d:nav-method>
-            <d:screen-dimension>
-                <d:size>1280</d:size>
-                <d:size>800</d:size>
-            </d:screen-dimension>
-            <d:xdpi>149</d:xdpi>
-            <d:ydpi>149</d:ydpi>
-        </d:default>
-
-        <d:config name="Landscape">
-            <d:screen-orientation>land</d:screen-orientation>
-        </d:config>
-        <d:config name="Portrait">
-            <d:screen-orientation>port</d:screen-orientation>
-        </d:config>
     </d:device>
-</d:layout-devices>
+</d:devices>