Revamped QVGA skin and new WVGA 800/854 skins

BUG: 1944280

23 files changed, 204 insertions, 147 deletions

diff --git a/emulator/skins/QVGA/.DS_Store b/emulator/skins/QVGA/.DS_Store
deleted file mode 100644
index 6aff2f6..0000000
--- a/emulator/skins/QVGA/.DS_Store
+++ /dev/null
diff --git a/emulator/skins/QVGA/arrow_down.png b/emulator/skins/QVGA/arrow_down.png
index 7398bae..b9fde22 100644
--- a/emulator/skins/QVGA/arrow_down.png
+++ b/emulator/skins/QVGA/arrow_down.png
diff --git a/emulator/skins/QVGA/arrow_left.png b/emulator/skins/QVGA/arrow_left.png
index f7e3c12..281b192 100644
--- a/emulator/skins/QVGA/arrow_left.png
+++ b/emulator/skins/QVGA/arrow_left.png
diff --git a/emulator/skins/QVGA/arrow_right.png b/emulator/skins/QVGA/arrow_right.png
index 33fa169..4cbc65d 100644
--- a/emulator/skins/QVGA/arrow_right.png
+++ b/emulator/skins/QVGA/arrow_right.png
diff --git a/emulator/skins/QVGA/arrow_up.png b/emulator/skins/QVGA/arrow_up.png
index f21105a..29c7121 100644
--- a/emulator/skins/QVGA/arrow_up.png
+++ b/emulator/skins/QVGA/arrow_up.png
diff --git a/emulator/skins/QVGA/back.png b/emulator/skins/QVGA/back.png
deleted file mode 100644
index 8519ebd..0000000
--- a/emulator/skins/QVGA/back.png
+++ /dev/null
diff --git a/emulator/skins/QVGA/background_land.png b/emulator/skins/QVGA/background_land.png
new file mode 100644
index 0000000..cb002b5
--- /dev/null
+++ b/emulator/skins/QVGA/background_land.png
diff --git a/emulator/skins/QVGA/background_port.png b/emulator/skins/QVGA/background_port.png
new file mode 100644
index 0000000..56316a9
--- /dev/null
+++ b/emulator/skins/QVGA/background_port.png
diff --git a/emulator/skins/QVGA/button.png b/emulator/skins/QVGA/button.png
new file mode 100644
index 0000000..8281d20
--- /dev/null
+++ b/emulator/skins/QVGA/button.png
diff --git a/emulator/skins/QVGA/controls.png b/emulator/skins/QVGA/controls.png
new file mode 100644
index 0000000..04b85e2
--- /dev/null
+++ b/emulator/skins/QVGA/controls.png
diff --git a/emulator/skins/QVGA/device.png b/emulator/skins/QVGA/device.png
deleted file mode 100644
index eb64104..0000000
--- a/emulator/skins/QVGA/device.png
+++ /dev/null
diff --git a/emulator/skins/QVGA/end.png b/emulator/skins/QVGA/end.png
deleted file mode 100644
index 8519ebd..0000000
--- a/emulator/skins/QVGA/end.png
+++ /dev/null
diff --git a/emulator/skins/QVGA/home.png b/emulator/skins/QVGA/home.png
deleted file mode 100644
index 8519ebd..0000000
--- a/emulator/skins/QVGA/home.png
+++ /dev/null
diff --git a/emulator/skins/QVGA/key.png b/emulator/skins/QVGA/key.png
index 7a3f563..40b03bf 100644
--- a/emulator/skins/QVGA/key.png
+++ b/emulator/skins/QVGA/key.png
diff --git a/emulator/skins/QVGA/keyboard.png b/emulator/skins/QVGA/keyboard.png
index bb076d3..ca49dcf 100644
--- a/emulator/skins/QVGA/keyboard.png
+++ b/emulator/skins/QVGA/keyboard.png
diff --git a/emulator/skins/QVGA/layout b/emulator/skins/QVGA/layout
index d7539c5..7b3f328 100644
--- a/emulator/skins/QVGA/layout
+++ b/emulator/skins/QVGA/layout
@@ -1,84 +1,104 @@
 parts {
-    device {
+    portrait {
+        background {
+            image   background_port.png
+        }
+    }
+    landscape {
         background {
-            image   device.png
+            image   background_land.png
         }
+    }
+
+    device {
         display {
             width   240
             height  320
-            x       33
-            y       69
+            x       0
+            y       0
+        }
+    }
+    
+    controls {
+        background {
+            image   controls.png
         }
-
         buttons {
             soft-left {
-                    image menu.png
-                    x 131
-                    y 404
+                    image button.png
+                    x 56
+                    y 142
             }
             home {
-                    image home.png
-                    x 77
-                    y 404
+                    image button.png
+                    x 0
+                    y 142
             }
             back {
-                    image back.png
-                    x 185
-                    y 404
+                    image button.png
+                    x 112
+                    y 142
             }
             dpad-up {
                     image arrow_up.png
-                    x 105
-                    y 463
+                    x 77
+                    y 53
             }
             dpad-down {
                     image arrow_down.png
-                    x 104
-                    y 519
+                    x 77
+                    y 106
             }
             dpad-left {
                     image arrow_left.png
-                    x 96
-                    y 470
+                    x 53
+                    y 53
             }
             dpad-right {
                     image arrow_right.png
-                    x 172
-                    y 470
+                    x 123
+                    y 53
             }
             dpad-center {
                     image select.png
-                    x 131
-                    y 492
+                    x 77
+                    y 81
             }
             phone-dial {
-                    image send.png
-                    x 23
-                    y 404
+                    image button.png
+                    x 0
+                    y 71
             }
             phone-hangup {
-                    image end.png
-                    x 238
-                    y 404
+                    image button.png
+                    x 168
+                    y 71
             }
 
             power {
-                    image power.png
-                    x -16
+                    image button.png
+                    x 168
                     y 0
             }
 
             volume-up {
-                    image volume_up.png
-                    x 289
-                    y 177
+                    image button.png
+                    x 112
+                    y 0
             }
 
             volume-down {
-                    image volume_down.png
-                    x 289
-                    y 233
+                    image button.png
+                    x 56
+                    y 0
+            }
+
+            search {
+                    image button.png
+                    x 168
+                    y 142
             }
+
         }
     }
 
@@ -89,242 +109,242 @@ parts {
         buttons {
             1 {
                 image  key.png
-                x  0
-                y  0
+                x  5
+                y  5
             }
             2 {
                 image  key.png
-                x 37
-                y 0
+                x 42
+                y 5
             }
             3 {
                 image  key.png
-                x 74
-                y 0
+                x 79
+                y 5
             }
             4 {
                 image  key.png
-                x 111
-                y 0
+                x 116
+                y 5
             }
             5 {
                 image  key.png
-                x 148
-                y 0
+                x 153
+                y 5
             }
             6 {
                 image  key.png
-                x 185
-                y 0
+                x 190
+                y 5
             }
             7 {
                 image  key.png
-                x 222
-                y 0
+                x 227
+                y 5
             }
             8 {
                 image  key.png
-                x 259
-                y 0
+                x 264
+                y 5
             }
             9 {
                 image  key.png
-                x 296
-                y 0
+                x 301
+                y 5
             }
             0 {
                 image  key.png
-                x 333
-                y 0
+                x 338
+                y 5
             }
 
             q {
                 image  key.png
-                x  0
-                y  36
+                x  5
+                y  41
             }
             w {
                 image  key.png
-                x 37
-                y 36
+                x 42
+                y 41
             }
             e {
                 image  key.png
-                x 74
-                y 36
+                x 79
+                y 41
             }
             r {
                 image  key.png
-                x 111
-                y 36
+                x 116
+                y 41
             }
             t {
                 image  key.png
-                x 148
-                y 36
+                x 153
+                y 41
             }
             y {
                 image  key.png
-                x 185
-                y 36
+                x 190
+                y 41
             }
             u {
                 image  key.png
-                x 222
-                y 36
+                x 227
+                y 41
             }
             i {
                 image  key.png
-                x 259
-                y 36
+                x 264
+                y 41
             }
             o {
                 image  key.png
-                x 296
-                y 36
+                x 301
+                y 41
             }
             p {
                 image  key.png
-                x 333
-                y 36
+                x 338
+                y 41
             }
 
             a {
                 image  key.png
-                x  0
-                y  72
+                x  5
+                y 77
             }
             s {
                 image  key.png
-                x 37
-                y 72
+                x 42
+                y 77
             }
             d {
                 image  key.png
-                x 74
-                y 72
+                x 79
+                y 77
             }
             f {
                 image  key.png
-                x 111
-                y 72
+                x 116
+                y 77
             }
             g {
                 image  key.png
-                x 148
-                y 72
+                x 153
+                y 77
             }
             h {
                 image  key.png
-                x 185
-                y 72
+                x 190
+                y 77
             }
             j {
                 image  key.png
-                x 222
-                y 72
+                x 227
+                y 77
             }
             k {
                 image  key.png
-                x 259
-                y 72
+                x 264
+                y 77
             }
             l {
                 image  key.png
-                x 296
-                y 72
+                x 301
+                y 77
             }
             DEL {
                 image  key.png
-                x 333
-                y 72
+                x 338
+                y 77
             }
 
             CAP {
                 image  key.png
-                x  0
-                y  108
+                x  5
+                y 113
             }
             z {
                 image  key.png
-                x 37
-                y 108
+                x 42
+                y 113
             }
             x {
                 image  key.png
-                x 74
-                y 108
+                x 79
+                y 113
             }
             c {
                 image  key.png
-                x 111
-                y 108
+                x 116
+                y 113
             }
             v {
                 image  key.png
-                x 148
-                y 108
+                x 153
+                y 113
             }
             b {
                 image  key.png
-                x 185
-                y 108
+                x 190
+                y 113
             }
             n {
                 image  key.png
-                x 222
-                y 108
+                x 227
+                y 113
             }
             m {
                 image  key.png
-                x 259
-                y 108
+                x 264
+                y 113
             }
             PERIOD {
                 image  key.png
-                x 296
-                y 108
+                x 301
+                y 113
             }
             ENTER {
                 image  key.png
-                x 333
-                y 108
+                x 338
+                y 113
             }
 
             ALT {
                 image  key.png
-                x  0
-                y  144
+                x  5
+                y 149
             }
             SYM {
                 image  key.png
-                x 37
-                y 144
+                x 42
+                y 149
             }
             AT {
                 image  key.png
-                x 74
-                y 144
+                x 79
+                y 149
             }
             SPACE {
                 image  spacebar.png
-                x 111
-                y 144
+                x 116
+                y 149
             }
             SLASH {
                 image  key.png
-                x 259
-                y 144
+                x 264
+                y 149
             }
             COMMA {
                 image  key.png
-                x 296
-                y 144
+                x 301
+                y 149
             }
             ALT2 {
                 image  key.png
-                x 333
-                y 144
+                x 338
+                y 149
             }
 
         }
@@ -333,39 +353,76 @@ parts {
 
 layouts {
     portrait {
-        width     750
-        height    610
+        width     640
+        height    602
         color     0xe0e0e0
         event     EV_SW:0:1
-
+        
         part1 {
-            name    device
-            x       30
-            y       097
+            name    portrait
+            x       0
+            y       0
         }
+
         part2 {
+            name    landscape
+            x       800
+            y       0
+        }
+
+        part3 {
+            name    device
+            x       200
+            y       30
+        }
+        part4 {
+            name    controls
+            x       410
+            y       396
+        }
+        part5 {
             name    keyboard
-            x       360
-            y       300
+            x       18
+            y       396
         }
+
     }
 
     landscape {
-        width     645
-        height    575
+        width     640
+        height    522
         color     0xe0e0e0
         event     EV_SW:0:0
 
         part1 {
+            name    portrait
+            x       800
+            y       0
+        }
+
+        part2 {
+            name    landscape
+            x       0
+            y       0
+        }
+
+        part3 {
             name      device
-            x         10
-            y         360
+            x         160
+            y         270
             rotation  3
         }
-        part2 {
+
+        part4 {
+            name     controls
+            x        410
+            y        317
+        }
+
+        part5 {
             name     keyboard
-            x        135
-            y        380
+            x        18
+            y        317
         }
     }
 }
diff --git a/emulator/skins/QVGA/menu.png b/emulator/skins/QVGA/menu.png
deleted file mode 100644
index 8519ebd..0000000
--- a/emulator/skins/QVGA/menu.png
+++ /dev/null
diff --git a/emulator/skins/QVGA/power.png b/emulator/skins/QVGA/power.png
deleted file mode 100644
index 0c04ced..0000000
--- a/emulator/skins/QVGA/power.png
+++ /dev/null
diff --git a/emulator/skins/QVGA/select.png b/emulator/skins/QVGA/select.png
index 8691f53..f4a65d3 100644
--- a/emulator/skins/QVGA/select.png
+++ b/emulator/skins/QVGA/select.png
diff --git a/emulator/skins/QVGA/send.png b/emulator/skins/QVGA/send.png
deleted file mode 100644
index 8519ebd..0000000
--- a/emulator/skins/QVGA/send.png
+++ /dev/null
diff --git a/emulator/skins/QVGA/spacebar.png b/emulator/skins/QVGA/spacebar.png
index 19fe604..aa459bd 100644
--- a/emulator/skins/QVGA/spacebar.png
+++ b/emulator/skins/QVGA/spacebar.png
diff --git a/emulator/skins/QVGA/volume_down.png b/emulator/skins/QVGA/volume_down.png
deleted file mode 100644
index 09175b1..0000000
--- a/emulator/skins/QVGA/volume_down.png
+++ /dev/null
diff --git a/emulator/skins/QVGA/volume_up.png b/emulator/skins/QVGA/volume_up.png
deleted file mode 100644
index ab52c63..0000000
--- a/emulator/skins/QVGA/volume_up.png
+++ /dev/null