Cherry-pick f0e5e933 from master.

Move emulator skins to development.git

Also added new default RAM config to the skins.

Change-Id: I520c485f4ef9f6d9d2eea126ed46d96b5fc3e785
diff --git a/build/sdk.atree b/build/sdk.atree
index deec35e..65d4ea5 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -72,12 +72,12 @@
 prebuilt/android-arm/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/kernel-qemu
 
 # emulator skins from sdk.git
-sdk/emulator/skins/QVGA      platforms/${PLATFORM_NAME}/skins/QVGA
-sdk/emulator/skins/WQVGA432  platforms/${PLATFORM_NAME}/skins/WQVGA432
-sdk/emulator/skins/WQVGA400  platforms/${PLATFORM_NAME}/skins/WQVGA400
-sdk/emulator/skins/HVGA      platforms/${PLATFORM_NAME}/skins/HVGA
-sdk/emulator/skins/WVGA800   platforms/${PLATFORM_NAME}/skins/WVGA800
-sdk/emulator/skins/WVGA854   platforms/${PLATFORM_NAME}/skins/WVGA854
+development/tools/emulator/skins/QVGA      platforms/${PLATFORM_NAME}/skins/QVGA
+development/tools/emulator/skins/WQVGA432  platforms/${PLATFORM_NAME}/skins/WQVGA432
+development/tools/emulator/skins/WQVGA400  platforms/${PLATFORM_NAME}/skins/WQVGA400
+development/tools/emulator/skins/HVGA      platforms/${PLATFORM_NAME}/skins/HVGA
+development/tools/emulator/skins/WVGA800   platforms/${PLATFORM_NAME}/skins/WVGA800
+development/tools/emulator/skins/WVGA854   platforms/${PLATFORM_NAME}/skins/WVGA854
 
 # Platform SDK properties
 sdk/files/sdk.properties     platforms/${PLATFORM_NAME}/sdk.properties
diff --git a/tools/emulator/skins/HVGA/arrow_down.png b/tools/emulator/skins/HVGA/arrow_down.png
new file mode 100644
index 0000000..b9fde22
--- /dev/null
+++ b/tools/emulator/skins/HVGA/arrow_down.png
Binary files differ
diff --git a/tools/emulator/skins/HVGA/arrow_left.png b/tools/emulator/skins/HVGA/arrow_left.png
new file mode 100644
index 0000000..281b192
--- /dev/null
+++ b/tools/emulator/skins/HVGA/arrow_left.png
Binary files differ
diff --git a/tools/emulator/skins/HVGA/arrow_right.png b/tools/emulator/skins/HVGA/arrow_right.png
new file mode 100644
index 0000000..4cbc65d
--- /dev/null
+++ b/tools/emulator/skins/HVGA/arrow_right.png
Binary files differ
diff --git a/tools/emulator/skins/HVGA/arrow_up.png b/tools/emulator/skins/HVGA/arrow_up.png
new file mode 100644
index 0000000..29c7121
--- /dev/null
+++ b/tools/emulator/skins/HVGA/arrow_up.png
Binary files differ
diff --git a/tools/emulator/skins/HVGA/background_land.png b/tools/emulator/skins/HVGA/background_land.png
new file mode 100644
index 0000000..09c857b
--- /dev/null
+++ b/tools/emulator/skins/HVGA/background_land.png
Binary files differ
diff --git a/tools/emulator/skins/HVGA/background_port.png b/tools/emulator/skins/HVGA/background_port.png
new file mode 100644
index 0000000..a452934
--- /dev/null
+++ b/tools/emulator/skins/HVGA/background_port.png
Binary files differ
diff --git a/tools/emulator/skins/HVGA/button.png b/tools/emulator/skins/HVGA/button.png
new file mode 100644
index 0000000..8281d20
--- /dev/null
+++ b/tools/emulator/skins/HVGA/button.png
Binary files differ
diff --git a/tools/emulator/skins/HVGA/controls.png b/tools/emulator/skins/HVGA/controls.png
new file mode 100644
index 0000000..04b85e2
--- /dev/null
+++ b/tools/emulator/skins/HVGA/controls.png
Binary files differ
diff --git a/tools/emulator/skins/HVGA/hardware.ini b/tools/emulator/skins/HVGA/hardware.ini
new file mode 100644
index 0000000..8de5e21
--- /dev/null
+++ b/tools/emulator/skins/HVGA/hardware.ini
@@ -0,0 +1,3 @@
+# skin-specific hardware values
+hw.lcd.density=160
+hw.ramSize=256
\ No newline at end of file
diff --git a/tools/emulator/skins/HVGA/key.png b/tools/emulator/skins/HVGA/key.png
new file mode 100644
index 0000000..40b03bf
--- /dev/null
+++ b/tools/emulator/skins/HVGA/key.png
Binary files differ
diff --git a/tools/emulator/skins/HVGA/keyboard.png b/tools/emulator/skins/HVGA/keyboard.png
new file mode 100644
index 0000000..ca49dcf
--- /dev/null
+++ b/tools/emulator/skins/HVGA/keyboard.png
Binary files differ
diff --git a/tools/emulator/skins/HVGA/layout b/tools/emulator/skins/HVGA/layout
new file mode 100644
index 0000000..cc82dde
--- /dev/null
+++ b/tools/emulator/skins/HVGA/layout
@@ -0,0 +1,443 @@
+parts {
+    portrait {
+        background {
+            image   background_port.png
+        }
+    }
+    landscape {
+        background {
+            image   background_land.png
+        }
+    }
+
+    device {
+        display {
+            width   320
+            height  480
+            x       0
+            y       0
+        }
+    }
+
+    controls {
+        background {
+            image   controls.png
+        }
+        buttons {
+            soft-left {
+                    image button.png
+                    x 56
+                    y 142
+            }
+            home {
+                    image button.png
+                    x 0
+                    y 142
+            }
+            back {
+                    image button.png
+                    x 112
+                    y 142
+            }
+            dpad-up {
+                    image arrow_up.png
+                    x 77
+                    y 53
+            }
+            dpad-down {
+                    image arrow_down.png
+                    x 77
+                    y 106
+            }
+            dpad-left {
+                    image arrow_left.png
+                    x 53
+                    y 53
+            }
+            dpad-right {
+                    image arrow_right.png
+                    x 123
+                    y 53
+            }
+            dpad-center {
+                    image select.png
+                    x 77
+                    y 81
+            }
+            phone-dial {
+                    image button.png
+                    x 0
+                    y 71
+            }
+            phone-hangup {
+                    image button.png
+                    x 168
+                    y 71
+            }
+
+            power {
+                    image button.png
+                    x 168
+                    y 0
+            }
+
+            volume-up {
+                    image button.png
+                    x 112
+                    y 0
+            }
+
+            volume-down {
+                    image button.png
+                    x 56
+                    y 0
+            }
+
+            search {
+                    image button.png
+                    x 168
+                    y 142
+            }
+
+        }
+    }
+
+    keyboard {
+        background {
+            image   keyboard.png
+        }
+        buttons {
+            1 {
+                image  key.png
+                x  5
+                y  5
+            }
+            2 {
+                image  key.png
+                x 42
+                y 5
+            }
+            3 {
+                image  key.png
+                x 79
+                y 5
+            }
+            4 {
+                image  key.png
+                x 116
+                y 5
+            }
+            5 {
+                image  key.png
+                x 153
+                y 5
+            }
+            6 {
+                image  key.png
+                x 190
+                y 5
+            }
+            7 {
+                image  key.png
+                x 227
+                y 5
+            }
+            8 {
+                image  key.png
+                x 264
+                y 5
+            }
+            9 {
+                image  key.png
+                x 301
+                y 5
+            }
+            0 {
+                image  key.png
+                x 338
+                y 5
+            }
+
+            q {
+                image  key.png
+                x  5
+                y  41
+            }
+            w {
+                image  key.png
+                x 42
+                y 41
+            }
+            e {
+                image  key.png
+                x 79
+                y 41
+            }
+            r {
+                image  key.png
+                x 116
+                y 41
+            }
+            t {
+                image  key.png
+                x 153
+                y 41
+            }
+            y {
+                image  key.png
+                x 190
+                y 41
+            }
+            u {
+                image  key.png
+                x 227
+                y 41
+            }
+            i {
+                image  key.png
+                x 264
+                y 41
+            }
+            o {
+                image  key.png
+                x 301
+                y 41
+            }
+            p {
+                image  key.png
+                x 338
+                y 41
+            }
+
+            a {
+                image  key.png
+                x  5
+                y 77
+            }
+            s {
+                image  key.png
+                x 42
+                y 77
+            }
+            d {
+                image  key.png
+                x 79
+                y 77
+            }
+            f {
+                image  key.png
+                x 116
+                y 77
+            }
+            g {
+                image  key.png
+                x 153
+                y 77
+            }
+            h {
+                image  key.png
+                x 190
+                y 77
+            }
+            j {
+                image  key.png
+                x 227
+                y 77
+            }
+            k {
+                image  key.png
+                x 264
+                y 77
+            }
+            l {
+                image  key.png
+                x 301
+                y 77
+            }
+            DEL {
+                image  key.png
+                x 338
+                y 77
+            }
+
+            CAP {
+                image  key.png
+                x  5
+                y 113
+            }
+            z {
+                image  key.png
+                x 42
+                y 113
+            }
+            x {
+                image  key.png
+                x 79
+                y 113
+            }
+            c {
+                image  key.png
+                x 116
+                y 113
+            }
+            v {
+                image  key.png
+                x 153
+                y 113
+            }
+            b {
+                image  key.png
+                x 190
+                y 113
+            }
+            n {
+                image  key.png
+                x 227
+                y 113
+            }
+            m {
+                image  key.png
+                x 264
+                y 113
+            }
+            PERIOD {
+                image  key.png
+                x 301
+                y 113
+            }
+            ENTER {
+                image  key.png
+                x 338
+                y 113
+            }
+
+            ALT {
+                image  key.png
+                x  5
+                y 149
+            }
+            SYM {
+                image  key.png
+                x 42
+                y 149
+            }
+            AT {
+                image  key.png
+                x 79
+                y 149
+            }
+            SPACE {
+                image  spacebar.png
+                x 116
+                y 149
+            }
+            SLASH {
+                image  key.png
+                x 264
+                y 149
+            }
+            COMMA {
+                image  key.png
+                x 301
+                y 149
+            }
+            ALT2 {
+                image  key.png
+                x 338
+                y 149
+            }
+
+        }
+    }
+}
+
+layouts {
+    portrait {
+        width     791
+        height    534
+        color     0xe0e0e0
+        event     EV_SW:0:1
+
+        part1 {
+            name    portrait
+            x       0
+            y       0
+        }
+
+        part2 {
+            name    landscape
+            x       800
+            y       0
+        }
+
+        part3 {
+            name    device
+            x       28
+            y       27
+        }
+        part4 {
+            name    controls
+            x       476
+            y       77
+        }
+        part5 {
+            name    keyboard
+            x       395
+            y       328
+        }
+
+    }
+
+    landscape {
+        width     640
+        height    601
+        color     0xe0e0e0
+        event     EV_SW:0:0
+
+        # the framework _always_ assume that the DPad
+        # has been physically rotated in landscape mode.
+        # however, with this skin, this is not the case
+        #
+        dpad-rotation 3
+
+        part1 {
+            name    portrait
+            x       800
+            y       0
+        }
+
+        part2 {
+            name    landscape
+            x       0
+            y       0
+        }
+
+        part3 {
+            name      device
+            x         80
+            y         349
+            rotation  3
+        }
+
+        part4 {
+            name     controls
+            x        410
+            y        396
+        }
+
+        part5 {
+            name     keyboard
+            x        18
+            y        396
+        }
+    }
+}
+
+keyboard {
+    charmap qwerty2
+}
+
+network {
+    speed  full
+    delay  none
+}
diff --git a/tools/emulator/skins/HVGA/select.png b/tools/emulator/skins/HVGA/select.png
new file mode 100644
index 0000000..f4a65d3
--- /dev/null
+++ b/tools/emulator/skins/HVGA/select.png
Binary files differ
diff --git a/tools/emulator/skins/HVGA/spacebar.png b/tools/emulator/skins/HVGA/spacebar.png
new file mode 100644
index 0000000..aa459bd
--- /dev/null
+++ b/tools/emulator/skins/HVGA/spacebar.png
Binary files differ
diff --git a/tools/emulator/skins/QVGA/arrow_down.png b/tools/emulator/skins/QVGA/arrow_down.png
new file mode 100644
index 0000000..b9fde22
--- /dev/null
+++ b/tools/emulator/skins/QVGA/arrow_down.png
Binary files differ
diff --git a/tools/emulator/skins/QVGA/arrow_left.png b/tools/emulator/skins/QVGA/arrow_left.png
new file mode 100644
index 0000000..281b192
--- /dev/null
+++ b/tools/emulator/skins/QVGA/arrow_left.png
Binary files differ
diff --git a/tools/emulator/skins/QVGA/arrow_right.png b/tools/emulator/skins/QVGA/arrow_right.png
new file mode 100644
index 0000000..4cbc65d
--- /dev/null
+++ b/tools/emulator/skins/QVGA/arrow_right.png
Binary files differ
diff --git a/tools/emulator/skins/QVGA/arrow_up.png b/tools/emulator/skins/QVGA/arrow_up.png
new file mode 100644
index 0000000..29c7121
--- /dev/null
+++ b/tools/emulator/skins/QVGA/arrow_up.png
Binary files differ
diff --git a/tools/emulator/skins/QVGA/background_land.png b/tools/emulator/skins/QVGA/background_land.png
new file mode 100644
index 0000000..cb002b5
--- /dev/null
+++ b/tools/emulator/skins/QVGA/background_land.png
Binary files differ
diff --git a/tools/emulator/skins/QVGA/background_port.png b/tools/emulator/skins/QVGA/background_port.png
new file mode 100644
index 0000000..6728562
--- /dev/null
+++ b/tools/emulator/skins/QVGA/background_port.png
Binary files differ
diff --git a/tools/emulator/skins/QVGA/button.png b/tools/emulator/skins/QVGA/button.png
new file mode 100644
index 0000000..8281d20
--- /dev/null
+++ b/tools/emulator/skins/QVGA/button.png
Binary files differ
diff --git a/tools/emulator/skins/QVGA/controls.png b/tools/emulator/skins/QVGA/controls.png
new file mode 100644
index 0000000..04b85e2
--- /dev/null
+++ b/tools/emulator/skins/QVGA/controls.png
Binary files differ
diff --git a/tools/emulator/skins/QVGA/hardware.ini b/tools/emulator/skins/QVGA/hardware.ini
new file mode 100644
index 0000000..1421893
--- /dev/null
+++ b/tools/emulator/skins/QVGA/hardware.ini
@@ -0,0 +1,3 @@
+# skin-specific hardware values
+hw.lcd.density=120
+hw.ramSize=256
diff --git a/tools/emulator/skins/QVGA/key.png b/tools/emulator/skins/QVGA/key.png
new file mode 100644
index 0000000..40b03bf
--- /dev/null
+++ b/tools/emulator/skins/QVGA/key.png
Binary files differ
diff --git a/tools/emulator/skins/QVGA/keyboard.png b/tools/emulator/skins/QVGA/keyboard.png
new file mode 100644
index 0000000..ca49dcf
--- /dev/null
+++ b/tools/emulator/skins/QVGA/keyboard.png
Binary files differ
diff --git a/tools/emulator/skins/QVGA/layout b/tools/emulator/skins/QVGA/layout
new file mode 100644
index 0000000..96f2133
--- /dev/null
+++ b/tools/emulator/skins/QVGA/layout
@@ -0,0 +1,439 @@
+parts {
+    portrait {
+        background {
+            image   background_port.png
+        }
+    }
+    landscape {
+        background {
+            image   background_land.png
+        }
+    }
+
+    device {
+        display {
+            width   240
+            height  320
+            x       0
+            y       0
+        }
+    }
+    
+    controls {
+        background {
+            image   controls.png
+        }
+        buttons {
+            soft-left {
+                    image button.png
+                    x 56
+                    y 142
+            }
+            home {
+                    image button.png
+                    x 0
+                    y 142
+            }
+            back {
+                    image button.png
+                    x 112
+                    y 142
+            }
+            dpad-up {
+                    image arrow_up.png
+                    x 77
+                    y 53
+            }
+            dpad-down {
+                    image arrow_down.png
+                    x 77
+                    y 106
+            }
+            dpad-left {
+                    image arrow_left.png
+                    x 53
+                    y 53
+            }
+            dpad-right {
+                    image arrow_right.png
+                    x 123
+                    y 53
+            }
+            dpad-center {
+                    image select.png
+                    x 77
+                    y 81
+            }
+            phone-dial {
+                    image button.png
+                    x 0
+                    y 71
+            }
+            phone-hangup {
+                    image button.png
+                    x 168
+                    y 71
+            }
+
+            power {
+                    image button.png
+                    x 168
+                    y 0
+            }
+
+            volume-up {
+                    image button.png
+                    x 112
+                    y 0
+            }
+
+            volume-down {
+                    image button.png
+                    x 56
+                    y 0
+            }
+
+            search {
+                    image button.png
+                    x 168
+                    y 142
+            }
+
+        }
+    }
+
+    keyboard {
+        background {
+            image   keyboard.png
+        }
+        buttons {
+            1 {
+                image  key.png
+                x  5
+                y  5
+            }
+            2 {
+                image  key.png
+                x 42
+                y 5
+            }
+            3 {
+                image  key.png
+                x 79
+                y 5
+            }
+            4 {
+                image  key.png
+                x 116
+                y 5
+            }
+            5 {
+                image  key.png
+                x 153
+                y 5
+            }
+            6 {
+                image  key.png
+                x 190
+                y 5
+            }
+            7 {
+                image  key.png
+                x 227
+                y 5
+            }
+            8 {
+                image  key.png
+                x 264
+                y 5
+            }
+            9 {
+                image  key.png
+                x 301
+                y 5
+            }
+            0 {
+                image  key.png
+                x 338
+                y 5
+            }
+
+            q {
+                image  key.png
+                x  5
+                y  41
+            }
+            w {
+                image  key.png
+                x 42
+                y 41
+            }
+            e {
+                image  key.png
+                x 79
+                y 41
+            }
+            r {
+                image  key.png
+                x 116
+                y 41
+            }
+            t {
+                image  key.png
+                x 153
+                y 41
+            }
+            y {
+                image  key.png
+                x 190
+                y 41
+            }
+            u {
+                image  key.png
+                x 227
+                y 41
+            }
+            i {
+                image  key.png
+                x 264
+                y 41
+            }
+            o {
+                image  key.png
+                x 301
+                y 41
+            }
+            p {
+                image  key.png
+                x 338
+                y 41
+            }
+
+            a {
+                image  key.png
+                x  5
+                y 77
+            }
+            s {
+                image  key.png
+                x 42
+                y 77
+            }
+            d {
+                image  key.png
+                x 79
+                y 77
+            }
+            f {
+                image  key.png
+                x 116
+                y 77
+            }
+            g {
+                image  key.png
+                x 153
+                y 77
+            }
+            h {
+                image  key.png
+                x 190
+                y 77
+            }
+            j {
+                image  key.png
+                x 227
+                y 77
+            }
+            k {
+                image  key.png
+                x 264
+                y 77
+            }
+            l {
+                image  key.png
+                x 301
+                y 77
+            }
+            DEL {
+                image  key.png
+                x 338
+                y 77
+            }
+
+            CAP {
+                image  key.png
+                x  5
+                y 113
+            }
+            z {
+                image  key.png
+                x 42
+                y 113
+            }
+            x {
+                image  key.png
+                x 79
+                y 113
+            }
+            c {
+                image  key.png
+                x 116
+                y 113
+            }
+            v {
+                image  key.png
+                x 153
+                y 113
+            }
+            b {
+                image  key.png
+                x 190
+                y 113
+            }
+            n {
+                image  key.png
+                x 227
+                y 113
+            }
+            m {
+                image  key.png
+                x 264
+                y 113
+            }
+            PERIOD {
+                image  key.png
+                x 301
+                y 113
+            }
+            ENTER {
+                image  key.png
+                x 338
+                y 113
+            }
+
+            ALT {
+                image  key.png
+                x  5
+                y 149
+            }
+            SYM {
+                image  key.png
+                x 42
+                y 149
+            }
+            AT {
+                image  key.png
+                x 79
+                y 149
+            }
+            SPACE {
+                image  spacebar.png
+                x 116
+                y 149
+            }
+            SLASH {
+                image  key.png
+                x 264
+                y 149
+            }
+            COMMA {
+                image  key.png
+                x 301
+                y 149
+            }
+            ALT2 {
+                image  key.png
+                x 338
+                y 149
+            }
+
+        }
+    }
+}
+
+layouts {
+    portrait {
+        width     711
+        height    435
+        color     0xe0e0e0
+        event     EV_SW:0:1
+        
+        part1 {
+            name    portrait
+            x       0
+            y       0
+        }
+
+        part2 {
+            name    landscape
+            x       800
+            y       0
+        }
+
+        part3 {
+            name    device
+            x       28
+            y       58
+        }
+        part4 {
+            name     controls
+            x        396
+            y        27
+        }
+        part5 {
+            name     keyboard
+            x        315
+            y        229
+        }
+    }
+
+    landscape {
+        width     640
+        height    522
+        color     0xe0e0e0
+        event     EV_SW:0:0
+
+        dpad-rotation 3
+
+
+        part1 {
+            name    portrait
+            x       800
+            y       0
+        }
+
+        part2 {
+            name    landscape
+            x       0
+            y       0
+        }
+
+        part3 {
+            name      device
+            x         160
+            y         270
+            rotation  3
+        }
+
+        part4 {
+            name     controls
+            x        410
+            y        317
+        }
+
+        part5 {
+            name     keyboard
+            x        18
+            y        317
+        }
+    }
+}
+
+keyboard {
+    charmap qwerty2
+}
+
+network {
+    speed  full
+    delay  none
+}
diff --git a/tools/emulator/skins/QVGA/select.png b/tools/emulator/skins/QVGA/select.png
new file mode 100644
index 0000000..f4a65d3
--- /dev/null
+++ b/tools/emulator/skins/QVGA/select.png
Binary files differ
diff --git a/tools/emulator/skins/QVGA/spacebar.png b/tools/emulator/skins/QVGA/spacebar.png
new file mode 100644
index 0000000..aa459bd
--- /dev/null
+++ b/tools/emulator/skins/QVGA/spacebar.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA400/arrow_down.png b/tools/emulator/skins/WQVGA400/arrow_down.png
new file mode 100644
index 0000000..b9fde22
--- /dev/null
+++ b/tools/emulator/skins/WQVGA400/arrow_down.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA400/arrow_left.png b/tools/emulator/skins/WQVGA400/arrow_left.png
new file mode 100644
index 0000000..281b192
--- /dev/null
+++ b/tools/emulator/skins/WQVGA400/arrow_left.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA400/arrow_right.png b/tools/emulator/skins/WQVGA400/arrow_right.png
new file mode 100644
index 0000000..4cbc65d
--- /dev/null
+++ b/tools/emulator/skins/WQVGA400/arrow_right.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA400/arrow_up.png b/tools/emulator/skins/WQVGA400/arrow_up.png
new file mode 100644
index 0000000..29c7121
--- /dev/null
+++ b/tools/emulator/skins/WQVGA400/arrow_up.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA400/background_land.png b/tools/emulator/skins/WQVGA400/background_land.png
new file mode 100644
index 0000000..c3fbee9
--- /dev/null
+++ b/tools/emulator/skins/WQVGA400/background_land.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA400/background_port.png b/tools/emulator/skins/WQVGA400/background_port.png
new file mode 100644
index 0000000..c88edb8
--- /dev/null
+++ b/tools/emulator/skins/WQVGA400/background_port.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA400/button.png b/tools/emulator/skins/WQVGA400/button.png
new file mode 100644
index 0000000..8281d20
--- /dev/null
+++ b/tools/emulator/skins/WQVGA400/button.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA400/controls.png b/tools/emulator/skins/WQVGA400/controls.png
new file mode 100644
index 0000000..04b85e2
--- /dev/null
+++ b/tools/emulator/skins/WQVGA400/controls.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA400/hardware.ini b/tools/emulator/skins/WQVGA400/hardware.ini
new file mode 100644
index 0000000..1421893
--- /dev/null
+++ b/tools/emulator/skins/WQVGA400/hardware.ini
@@ -0,0 +1,3 @@
+# skin-specific hardware values
+hw.lcd.density=120
+hw.ramSize=256
diff --git a/tools/emulator/skins/WQVGA400/key.png b/tools/emulator/skins/WQVGA400/key.png
new file mode 100644
index 0000000..40b03bf
--- /dev/null
+++ b/tools/emulator/skins/WQVGA400/key.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA400/keyboard.png b/tools/emulator/skins/WQVGA400/keyboard.png
new file mode 100644
index 0000000..ca49dcf
--- /dev/null
+++ b/tools/emulator/skins/WQVGA400/keyboard.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA400/layout b/tools/emulator/skins/WQVGA400/layout
new file mode 100644
index 0000000..4d71adf
--- /dev/null
+++ b/tools/emulator/skins/WQVGA400/layout
@@ -0,0 +1,438 @@
+parts {
+    portrait {
+        background {
+            image   background_port.png
+        }
+    }
+    landscape {
+        background {
+            image   background_land.png
+        }
+    }
+
+    device {
+        display {
+            width   240
+            height  400
+            x       0
+            y       0
+        }
+    }
+    
+    controls {
+        background {
+            image   controls.png
+        }
+        buttons {
+            soft-left {
+                    image button.png
+                    x 56
+                    y 142
+            }
+            home {
+                    image button.png
+                    x 0
+                    y 142
+            }
+            back {
+                    image button.png
+                    x 112
+                    y 142
+            }
+            dpad-up {
+                    image arrow_up.png
+                    x 77
+                    y 53
+            }
+            dpad-down {
+                    image arrow_down.png
+                    x 77
+                    y 106
+            }
+            dpad-left {
+                    image arrow_left.png
+                    x 53
+                    y 53
+            }
+            dpad-right {
+                    image arrow_right.png
+                    x 123
+                    y 53
+            }
+            dpad-center {
+                    image select.png
+                    x 77
+                    y 81
+            }
+            phone-dial {
+                    image button.png
+                    x 0
+                    y 71
+            }
+            phone-hangup {
+                    image button.png
+                    x 168
+                    y 71
+            }
+
+            power {
+                    image button.png
+                    x 168
+                    y 0
+            }
+
+            volume-up {
+                    image button.png
+                    x 112
+                    y 0
+            }
+
+            volume-down {
+                    image button.png
+                    x 56
+                    y 0
+            }
+
+            search {
+                    image button.png
+                    x 168
+                    y 142
+            }
+
+        }
+    }
+
+    keyboard {
+        background {
+            image   keyboard.png
+        }
+        buttons {
+            1 {
+                image  key.png
+                x  5
+                y  5
+            }
+            2 {
+                image  key.png
+                x 42
+                y 5
+            }
+            3 {
+                image  key.png
+                x 79
+                y 5
+            }
+            4 {
+                image  key.png
+                x 116
+                y 5
+            }
+            5 {
+                image  key.png
+                x 153
+                y 5
+            }
+            6 {
+                image  key.png
+                x 190
+                y 5
+            }
+            7 {
+                image  key.png
+                x 227
+                y 5
+            }
+            8 {
+                image  key.png
+                x 264
+                y 5
+            }
+            9 {
+                image  key.png
+                x 301
+                y 5
+            }
+            0 {
+                image  key.png
+                x 338
+                y 5
+            }
+
+            q {
+                image  key.png
+                x  5
+                y  41
+            }
+            w {
+                image  key.png
+                x 42
+                y 41
+            }
+            e {
+                image  key.png
+                x 79
+                y 41
+            }
+            r {
+                image  key.png
+                x 116
+                y 41
+            }
+            t {
+                image  key.png
+                x 153
+                y 41
+            }
+            y {
+                image  key.png
+                x 190
+                y 41
+            }
+            u {
+                image  key.png
+                x 227
+                y 41
+            }
+            i {
+                image  key.png
+                x 264
+                y 41
+            }
+            o {
+                image  key.png
+                x 301
+                y 41
+            }
+            p {
+                image  key.png
+                x 338
+                y 41
+            }
+
+            a {
+                image  key.png
+                x  5
+                y 77
+            }
+            s {
+                image  key.png
+                x 42
+                y 77
+            }
+            d {
+                image  key.png
+                x 79
+                y 77
+            }
+            f {
+                image  key.png
+                x 116
+                y 77
+            }
+            g {
+                image  key.png
+                x 153
+                y 77
+            }
+            h {
+                image  key.png
+                x 190
+                y 77
+            }
+            j {
+                image  key.png
+                x 227
+                y 77
+            }
+            k {
+                image  key.png
+                x 264
+                y 77
+            }
+            l {
+                image  key.png
+                x 301
+                y 77
+            }
+            DEL {
+                image  key.png
+                x 338
+                y 77
+            }
+
+            CAP {
+                image  key.png
+                x  5
+                y 113
+            }
+            z {
+                image  key.png
+                x 42
+                y 113
+            }
+            x {
+                image  key.png
+                x 79
+                y 113
+            }
+            c {
+                image  key.png
+                x 116
+                y 113
+            }
+            v {
+                image  key.png
+                x 153
+                y 113
+            }
+            b {
+                image  key.png
+                x 190
+                y 113
+            }
+            n {
+                image  key.png
+                x 227
+                y 113
+            }
+            m {
+                image  key.png
+                x 264
+                y 113
+            }
+            PERIOD {
+                image  key.png
+                x 301
+                y 113
+            }
+            ENTER {
+                image  key.png
+                x 338
+                y 113
+            }
+
+            ALT {
+                image  key.png
+                x  5
+                y 149
+            }
+            SYM {
+                image  key.png
+                x 42
+                y 149
+            }
+            AT {
+                image  key.png
+                x 79
+                y 149
+            }
+            SPACE {
+                image  spacebar.png
+                x 116
+                y 149
+            }
+            SLASH {
+                image  key.png
+                x 264
+                y 149
+            }
+            COMMA {
+                image  key.png
+                x 301
+                y 149
+            }
+            ALT2 {
+                image  key.png
+                x 338
+                y 149
+            }
+
+        }
+    }
+}
+
+layouts {
+    portrait {
+        width     711
+        height    454
+        color     0xe0e0e0
+        event     EV_SW:0:1
+        
+        part1 {
+            name    portrait
+            x       0
+            y       0
+        }
+
+        part2 {
+            name    landscape
+            x       800
+            y       0
+        }
+
+        part3 {
+            name    device
+            x       28
+            y       27
+        }
+        part4 {
+            name     controls
+            x        396
+            y        37
+        }
+        part5 {
+            name     keyboard
+            x        315
+            y        248
+        }
+    }
+
+    landscape {
+        width     640
+        height    522
+        color     0xe0e0e0
+        event     EV_SW:0:0
+
+        dpad-rotation 3
+
+        part1 {
+            name    portrait
+            x       800
+            y       0
+        }
+
+        part2 {
+            name    landscape
+            x       0
+            y       0
+        }
+
+        part3 {
+            name      device
+            x         120
+            y         270
+            rotation  3
+        }
+
+        part4 {
+            name     controls
+            x        410
+            y        317
+        }
+
+        part5 {
+            name     keyboard
+            x        18
+            y        317
+        }
+    }
+}
+
+keyboard {
+    charmap qwerty2
+}
+
+network {
+    speed  full
+    delay  none
+}
diff --git a/tools/emulator/skins/WQVGA400/select.png b/tools/emulator/skins/WQVGA400/select.png
new file mode 100644
index 0000000..f4a65d3
--- /dev/null
+++ b/tools/emulator/skins/WQVGA400/select.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA400/spacebar.png b/tools/emulator/skins/WQVGA400/spacebar.png
new file mode 100644
index 0000000..aa459bd
--- /dev/null
+++ b/tools/emulator/skins/WQVGA400/spacebar.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA432/arrow_down.png b/tools/emulator/skins/WQVGA432/arrow_down.png
new file mode 100644
index 0000000..b9fde22
--- /dev/null
+++ b/tools/emulator/skins/WQVGA432/arrow_down.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA432/arrow_left.png b/tools/emulator/skins/WQVGA432/arrow_left.png
new file mode 100644
index 0000000..281b192
--- /dev/null
+++ b/tools/emulator/skins/WQVGA432/arrow_left.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA432/arrow_right.png b/tools/emulator/skins/WQVGA432/arrow_right.png
new file mode 100644
index 0000000..4cbc65d
--- /dev/null
+++ b/tools/emulator/skins/WQVGA432/arrow_right.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA432/arrow_up.png b/tools/emulator/skins/WQVGA432/arrow_up.png
new file mode 100644
index 0000000..29c7121
--- /dev/null
+++ b/tools/emulator/skins/WQVGA432/arrow_up.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA432/background_land.png b/tools/emulator/skins/WQVGA432/background_land.png
new file mode 100644
index 0000000..1450e25
--- /dev/null
+++ b/tools/emulator/skins/WQVGA432/background_land.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA432/background_port.png b/tools/emulator/skins/WQVGA432/background_port.png
new file mode 100644
index 0000000..891ab45
--- /dev/null
+++ b/tools/emulator/skins/WQVGA432/background_port.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA432/button.png b/tools/emulator/skins/WQVGA432/button.png
new file mode 100644
index 0000000..8281d20
--- /dev/null
+++ b/tools/emulator/skins/WQVGA432/button.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA432/controls.png b/tools/emulator/skins/WQVGA432/controls.png
new file mode 100644
index 0000000..04b85e2
--- /dev/null
+++ b/tools/emulator/skins/WQVGA432/controls.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA432/hardware.ini b/tools/emulator/skins/WQVGA432/hardware.ini
new file mode 100644
index 0000000..1421893
--- /dev/null
+++ b/tools/emulator/skins/WQVGA432/hardware.ini
@@ -0,0 +1,3 @@
+# skin-specific hardware values
+hw.lcd.density=120
+hw.ramSize=256
diff --git a/tools/emulator/skins/WQVGA432/key.png b/tools/emulator/skins/WQVGA432/key.png
new file mode 100644
index 0000000..40b03bf
--- /dev/null
+++ b/tools/emulator/skins/WQVGA432/key.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA432/keyboard.png b/tools/emulator/skins/WQVGA432/keyboard.png
new file mode 100644
index 0000000..ca49dcf
--- /dev/null
+++ b/tools/emulator/skins/WQVGA432/keyboard.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA432/layout b/tools/emulator/skins/WQVGA432/layout
new file mode 100644
index 0000000..006e955
--- /dev/null
+++ b/tools/emulator/skins/WQVGA432/layout
@@ -0,0 +1,438 @@
+parts {
+    portrait {
+        background {
+            image   background_port.png
+        }
+    }
+    landscape {
+        background {
+            image   background_land.png
+        }
+    }
+
+    device {
+        display {
+            width   240
+            height  432
+            x       0
+            y       0
+        }
+    }
+    
+    controls {
+        background {
+            image   controls.png
+        }
+        buttons {
+            soft-left {
+                    image button.png
+                    x 56
+                    y 142
+            }
+            home {
+                    image button.png
+                    x 0
+                    y 142
+            }
+            back {
+                    image button.png
+                    x 112
+                    y 142
+            }
+            dpad-up {
+                    image arrow_up.png
+                    x 77
+                    y 53
+            }
+            dpad-down {
+                    image arrow_down.png
+                    x 77
+                    y 106
+            }
+            dpad-left {
+                    image arrow_left.png
+                    x 53
+                    y 53
+            }
+            dpad-right {
+                    image arrow_right.png
+                    x 123
+                    y 53
+            }
+            dpad-center {
+                    image select.png
+                    x 77
+                    y 81
+            }
+            phone-dial {
+                    image button.png
+                    x 0
+                    y 71
+            }
+            phone-hangup {
+                    image button.png
+                    x 168
+                    y 71
+            }
+
+            power {
+                    image button.png
+                    x 168
+                    y 0
+            }
+
+            volume-up {
+                    image button.png
+                    x 112
+                    y 0
+            }
+
+            volume-down {
+                    image button.png
+                    x 56
+                    y 0
+            }
+
+            search {
+                    image button.png
+                    x 168
+                    y 142
+            }
+
+        }
+    }
+
+    keyboard {
+        background {
+            image   keyboard.png
+        }
+        buttons {
+            1 {
+                image  key.png
+                x  5
+                y  5
+            }
+            2 {
+                image  key.png
+                x 42
+                y 5
+            }
+            3 {
+                image  key.png
+                x 79
+                y 5
+            }
+            4 {
+                image  key.png
+                x 116
+                y 5
+            }
+            5 {
+                image  key.png
+                x 153
+                y 5
+            }
+            6 {
+                image  key.png
+                x 190
+                y 5
+            }
+            7 {
+                image  key.png
+                x 227
+                y 5
+            }
+            8 {
+                image  key.png
+                x 264
+                y 5
+            }
+            9 {
+                image  key.png
+                x 301
+                y 5
+            }
+            0 {
+                image  key.png
+                x 338
+                y 5
+            }
+
+            q {
+                image  key.png
+                x  5
+                y  41
+            }
+            w {
+                image  key.png
+                x 42
+                y 41
+            }
+            e {
+                image  key.png
+                x 79
+                y 41
+            }
+            r {
+                image  key.png
+                x 116
+                y 41
+            }
+            t {
+                image  key.png
+                x 153
+                y 41
+            }
+            y {
+                image  key.png
+                x 190
+                y 41
+            }
+            u {
+                image  key.png
+                x 227
+                y 41
+            }
+            i {
+                image  key.png
+                x 264
+                y 41
+            }
+            o {
+                image  key.png
+                x 301
+                y 41
+            }
+            p {
+                image  key.png
+                x 338
+                y 41
+            }
+
+            a {
+                image  key.png
+                x  5
+                y 77
+            }
+            s {
+                image  key.png
+                x 42
+                y 77
+            }
+            d {
+                image  key.png
+                x 79
+                y 77
+            }
+            f {
+                image  key.png
+                x 116
+                y 77
+            }
+            g {
+                image  key.png
+                x 153
+                y 77
+            }
+            h {
+                image  key.png
+                x 190
+                y 77
+            }
+            j {
+                image  key.png
+                x 227
+                y 77
+            }
+            k {
+                image  key.png
+                x 264
+                y 77
+            }
+            l {
+                image  key.png
+                x 301
+                y 77
+            }
+            DEL {
+                image  key.png
+                x 338
+                y 77
+            }
+
+            CAP {
+                image  key.png
+                x  5
+                y 113
+            }
+            z {
+                image  key.png
+                x 42
+                y 113
+            }
+            x {
+                image  key.png
+                x 79
+                y 113
+            }
+            c {
+                image  key.png
+                x 116
+                y 113
+            }
+            v {
+                image  key.png
+                x 153
+                y 113
+            }
+            b {
+                image  key.png
+                x 190
+                y 113
+            }
+            n {
+                image  key.png
+                x 227
+                y 113
+            }
+            m {
+                image  key.png
+                x 264
+                y 113
+            }
+            PERIOD {
+                image  key.png
+                x 301
+                y 113
+            }
+            ENTER {
+                image  key.png
+                x 338
+                y 113
+            }
+
+            ALT {
+                image  key.png
+                x  5
+                y 149
+            }
+            SYM {
+                image  key.png
+                x 42
+                y 149
+            }
+            AT {
+                image  key.png
+                x 79
+                y 149
+            }
+            SPACE {
+                image  spacebar.png
+                x 116
+                y 149
+            }
+            SLASH {
+                image  key.png
+                x 264
+                y 149
+            }
+            COMMA {
+                image  key.png
+                x 301
+                y 149
+            }
+            ALT2 {
+                image  key.png
+                x 338
+                y 149
+            }
+
+        }
+    }
+}
+
+layouts {
+    portrait {
+        width     711
+        height    486
+        color     0xe0e0e0
+        event     EV_SW:0:1
+        
+        part1 {
+            name    portrait
+            x       0
+            y       0
+        }
+
+        part2 {
+            name    landscape
+            x       800
+            y       0
+        }
+
+        part3 {
+            name    device
+            x       28
+            y       27
+        }
+        part4 {
+            name     controls
+            x        396
+            y        53
+        }
+        part5 {
+            name     keyboard
+            x        315
+            y        280
+        }
+    }
+
+    landscape {
+        width     640
+        height    522
+        color     0xe0e0e0
+        event     EV_SW:0:0
+
+        dpad-rotation 3
+
+        part1 {
+            name    portrait
+            x       800
+            y       0
+        }
+
+        part2 {
+            name    landscape
+            x       0
+            y       0
+        }
+
+        part3 {
+            name      device
+            x         104
+            y         270
+            rotation  3
+        }
+
+        part4 {
+            name     controls
+            x        410
+            y        317
+        }
+
+        part5 {
+            name     keyboard
+            x        18
+            y        317
+        }
+    }
+}
+
+keyboard {
+    charmap qwerty2
+}
+
+network {
+    speed  full
+    delay  none
+}
diff --git a/tools/emulator/skins/WQVGA432/select.png b/tools/emulator/skins/WQVGA432/select.png
new file mode 100644
index 0000000..f4a65d3
--- /dev/null
+++ b/tools/emulator/skins/WQVGA432/select.png
Binary files differ
diff --git a/tools/emulator/skins/WQVGA432/spacebar.png b/tools/emulator/skins/WQVGA432/spacebar.png
new file mode 100644
index 0000000..aa459bd
--- /dev/null
+++ b/tools/emulator/skins/WQVGA432/spacebar.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA800/arrow_down.png b/tools/emulator/skins/WVGA800/arrow_down.png
new file mode 100644
index 0000000..b9fde22
--- /dev/null
+++ b/tools/emulator/skins/WVGA800/arrow_down.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA800/arrow_left.png b/tools/emulator/skins/WVGA800/arrow_left.png
new file mode 100644
index 0000000..281b192
--- /dev/null
+++ b/tools/emulator/skins/WVGA800/arrow_left.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA800/arrow_right.png b/tools/emulator/skins/WVGA800/arrow_right.png
new file mode 100644
index 0000000..4cbc65d
--- /dev/null
+++ b/tools/emulator/skins/WVGA800/arrow_right.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA800/arrow_up.png b/tools/emulator/skins/WVGA800/arrow_up.png
new file mode 100644
index 0000000..29c7121
--- /dev/null
+++ b/tools/emulator/skins/WVGA800/arrow_up.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA800/background_land.png b/tools/emulator/skins/WVGA800/background_land.png
new file mode 100644
index 0000000..4967717
--- /dev/null
+++ b/tools/emulator/skins/WVGA800/background_land.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA800/background_port.png b/tools/emulator/skins/WVGA800/background_port.png
new file mode 100644
index 0000000..13ef2ea
--- /dev/null
+++ b/tools/emulator/skins/WVGA800/background_port.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA800/button.png b/tools/emulator/skins/WVGA800/button.png
new file mode 100644
index 0000000..8281d20
--- /dev/null
+++ b/tools/emulator/skins/WVGA800/button.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA800/controls.png b/tools/emulator/skins/WVGA800/controls.png
new file mode 100644
index 0000000..04b85e2
--- /dev/null
+++ b/tools/emulator/skins/WVGA800/controls.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA800/hardware.ini b/tools/emulator/skins/WVGA800/hardware.ini
new file mode 100644
index 0000000..19e3b35
--- /dev/null
+++ b/tools/emulator/skins/WVGA800/hardware.ini
@@ -0,0 +1,4 @@
+# skin-specific hardware values
+hw.lcd.density=240
+vm.heapSize=24
+hw.ramSize=256
\ No newline at end of file
diff --git a/tools/emulator/skins/WVGA800/key.png b/tools/emulator/skins/WVGA800/key.png
new file mode 100644
index 0000000..40b03bf
--- /dev/null
+++ b/tools/emulator/skins/WVGA800/key.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA800/keyboard.png b/tools/emulator/skins/WVGA800/keyboard.png
new file mode 100644
index 0000000..ca49dcf
--- /dev/null
+++ b/tools/emulator/skins/WVGA800/keyboard.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA800/layout b/tools/emulator/skins/WVGA800/layout
new file mode 100644
index 0000000..63647f3
--- /dev/null
+++ b/tools/emulator/skins/WVGA800/layout
@@ -0,0 +1,439 @@
+parts {
+    portrait {
+        background {
+            image   background_port.png
+        }
+    }
+    landscape {
+        background {
+            image   background_land.png
+        }
+    }
+
+    device {
+        display {
+            width   480
+            height  800
+            x       0
+            y       0
+        }
+    }
+    
+    controls {
+        background {
+            image   controls.png
+        }
+        buttons {
+            soft-left {
+                    image button.png
+                    x 56
+                    y 142
+            }
+            home {
+                    image button.png
+                    x 0
+                    y 142
+            }
+            back {
+                    image button.png
+                    x 112
+                    y 142
+            }
+            dpad-up {
+                    image arrow_up.png
+                    x 77
+                    y 53
+            }
+            dpad-down {
+                    image arrow_down.png
+                    x 77
+                    y 106
+            }
+            dpad-left {
+                    image arrow_left.png
+                    x 53
+                    y 53
+            }
+            dpad-right {
+                    image arrow_right.png
+                    x 123
+                    y 53
+            }
+            dpad-center {
+                    image select.png
+                    x 77
+                    y 81
+            }
+            phone-dial {
+                    image button.png
+                    x 0
+                    y 71
+            }
+            phone-hangup {
+                    image button.png
+                    x 168
+                    y 71
+            }
+
+            power {
+                    image button.png
+                    x 168
+                    y 0
+            }
+
+            volume-up {
+                    image button.png
+                    x 112
+                    y 0
+            }
+
+            volume-down {
+                    image button.png
+                    x 56
+                    y 0
+            }
+
+            search {
+                    image button.png
+                    x 168
+                    y 142
+            }
+
+        }
+    }
+
+    keyboard {
+        background {
+            image   keyboard.png
+        }
+        buttons {
+            1 {
+                image  key.png
+                x  5
+                y  5
+            }
+            2 {
+                image  key.png
+                x 42
+                y 5
+            }
+            3 {
+                image  key.png
+                x 79
+                y 5
+            }
+            4 {
+                image  key.png
+                x 116
+                y 5
+            }
+            5 {
+                image  key.png
+                x 153
+                y 5
+            }
+            6 {
+                image  key.png
+                x 190
+                y 5
+            }
+            7 {
+                image  key.png
+                x 227
+                y 5
+            }
+            8 {
+                image  key.png
+                x 264
+                y 5
+            }
+            9 {
+                image  key.png
+                x 301
+                y 5
+            }
+            0 {
+                image  key.png
+                x 338
+                y 5
+            }
+
+            q {
+                image  key.png
+                x  5
+                y  41
+            }
+            w {
+                image  key.png
+                x 42
+                y 41
+            }
+            e {
+                image  key.png
+                x 79
+                y 41
+            }
+            r {
+                image  key.png
+                x 116
+                y 41
+            }
+            t {
+                image  key.png
+                x 153
+                y 41
+            }
+            y {
+                image  key.png
+                x 190
+                y 41
+            }
+            u {
+                image  key.png
+                x 227
+                y 41
+            }
+            i {
+                image  key.png
+                x 264
+                y 41
+            }
+            o {
+                image  key.png
+                x 301
+                y 41
+            }
+            p {
+                image  key.png
+                x 338
+                y 41
+            }
+
+            a {
+                image  key.png
+                x  5
+                y 77
+            }
+            s {
+                image  key.png
+                x 42
+                y 77
+            }
+            d {
+                image  key.png
+                x 79
+                y 77
+            }
+            f {
+                image  key.png
+                x 116
+                y 77
+            }
+            g {
+                image  key.png
+                x 153
+                y 77
+            }
+            h {
+                image  key.png
+                x 190
+                y 77
+            }
+            j {
+                image  key.png
+                x 227
+                y 77
+            }
+            k {
+                image  key.png
+                x 264
+                y 77
+            }
+            l {
+                image  key.png
+                x 301
+                y 77
+            }
+            DEL {
+                image  key.png
+                x 338
+                y 77
+            }
+
+            CAP {
+                image  key.png
+                x  5
+                y 113
+            }
+            z {
+                image  key.png
+                x 42
+                y 113
+            }
+            x {
+                image  key.png
+                x 79
+                y 113
+            }
+            c {
+                image  key.png
+                x 116
+                y 113
+            }
+            v {
+                image  key.png
+                x 153
+                y 113
+            }
+            b {
+                image  key.png
+                x 190
+                y 113
+            }
+            n {
+                image  key.png
+                x 227
+                y 113
+            }
+            m {
+                image  key.png
+                x 264
+                y 113
+            }
+            PERIOD {
+                image  key.png
+                x 301
+                y 113
+            }
+            ENTER {
+                image  key.png
+                x 338
+                y 113
+            }
+
+            ALT {
+                image  key.png
+                x  5
+                y 149
+            }
+            SYM {
+                image  key.png
+                x 42
+                y 149
+            }
+            AT {
+                image  key.png
+                x 79
+                y 149
+            }
+            SPACE {
+                image  spacebar.png
+                x 116
+                y 149
+            }
+            SLASH {
+                image  key.png
+                x 264
+                y 149
+            }
+            COMMA {
+                image  key.png
+                x 301
+                y 149
+            }
+            ALT2 {
+                image  key.png
+                x 338
+                y 149
+            }
+
+        }
+    }
+}
+
+layouts {
+    portrait {
+        width     950
+        height    854
+        color     0xe0e0e0
+        event     EV_SW:0:1
+        
+        part1 {
+            name    portrait
+            x       0
+            y       0
+        }
+
+        part2 {
+            name    landscape
+            x       1000
+            y       0
+        }
+
+        part3 {
+            name    device
+            x       27
+            y       27
+        }
+        part4 {
+            name    controls
+            x       635
+            y       207
+        }
+        part5 {
+            name    keyboard
+            x       554
+            y       459
+        }
+
+    }
+
+    landscape {
+        width     853
+        height    761
+        color     0xe0e0e0
+        event     EV_SW:0:0
+
+        dpad-rotation 3
+
+        part1 {
+            name    portrait
+            x       900
+            y       0
+        }
+
+        part2 {
+            name    landscape
+            x       0
+            y       0
+        }
+
+        part3 {
+            name      device
+            x         26
+            y         509
+            rotation  3
+        }
+
+        part4 {
+            name     controls
+            x        539
+            y        556
+        }
+
+        part5 {
+            name     keyboard
+            x        98
+            y        556
+        }
+    }
+}
+
+keyboard {
+    charmap qwerty2
+}
+
+network {
+    speed  full
+    delay  none
+}
diff --git a/tools/emulator/skins/WVGA800/select.png b/tools/emulator/skins/WVGA800/select.png
new file mode 100644
index 0000000..f4a65d3
--- /dev/null
+++ b/tools/emulator/skins/WVGA800/select.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA800/spacebar.png b/tools/emulator/skins/WVGA800/spacebar.png
new file mode 100644
index 0000000..aa459bd
--- /dev/null
+++ b/tools/emulator/skins/WVGA800/spacebar.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA854/arrow_down.png b/tools/emulator/skins/WVGA854/arrow_down.png
new file mode 100644
index 0000000..b9fde22
--- /dev/null
+++ b/tools/emulator/skins/WVGA854/arrow_down.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA854/arrow_left.png b/tools/emulator/skins/WVGA854/arrow_left.png
new file mode 100644
index 0000000..281b192
--- /dev/null
+++ b/tools/emulator/skins/WVGA854/arrow_left.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA854/arrow_right.png b/tools/emulator/skins/WVGA854/arrow_right.png
new file mode 100644
index 0000000..4cbc65d
--- /dev/null
+++ b/tools/emulator/skins/WVGA854/arrow_right.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA854/arrow_up.png b/tools/emulator/skins/WVGA854/arrow_up.png
new file mode 100644
index 0000000..29c7121
--- /dev/null
+++ b/tools/emulator/skins/WVGA854/arrow_up.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA854/background_land.png b/tools/emulator/skins/WVGA854/background_land.png
new file mode 100644
index 0000000..4f0f90e
--- /dev/null
+++ b/tools/emulator/skins/WVGA854/background_land.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA854/background_port.png b/tools/emulator/skins/WVGA854/background_port.png
new file mode 100644
index 0000000..e35bf67
--- /dev/null
+++ b/tools/emulator/skins/WVGA854/background_port.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA854/button.png b/tools/emulator/skins/WVGA854/button.png
new file mode 100644
index 0000000..8281d20
--- /dev/null
+++ b/tools/emulator/skins/WVGA854/button.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA854/controls.png b/tools/emulator/skins/WVGA854/controls.png
new file mode 100644
index 0000000..04b85e2
--- /dev/null
+++ b/tools/emulator/skins/WVGA854/controls.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA854/hardware.ini b/tools/emulator/skins/WVGA854/hardware.ini
new file mode 100644
index 0000000..9434288
--- /dev/null
+++ b/tools/emulator/skins/WVGA854/hardware.ini
@@ -0,0 +1,4 @@
+# skin-specific hardware values
+hw.lcd.density=240
+vm.heapSize=24
+hw.ramSize=256
diff --git a/tools/emulator/skins/WVGA854/key.png b/tools/emulator/skins/WVGA854/key.png
new file mode 100644
index 0000000..40b03bf
--- /dev/null
+++ b/tools/emulator/skins/WVGA854/key.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA854/keyboard.png b/tools/emulator/skins/WVGA854/keyboard.png
new file mode 100644
index 0000000..ca49dcf
--- /dev/null
+++ b/tools/emulator/skins/WVGA854/keyboard.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA854/layout b/tools/emulator/skins/WVGA854/layout
new file mode 100644
index 0000000..b086ddc
--- /dev/null
+++ b/tools/emulator/skins/WVGA854/layout
@@ -0,0 +1,439 @@
+parts {
+    portrait {
+        background {
+            image   background_port.png
+        }
+    }
+    landscape {
+        background {
+            image   background_land.png
+        }
+    }
+
+    device {
+        display {
+            width   480
+            height  854
+            x       0
+            y       0
+        }
+    }
+    
+    controls {
+        background {
+            image   controls.png
+        }
+        buttons {
+            soft-left {
+                    image button.png
+                    x 56
+                    y 142
+            }
+            home {
+                    image button.png
+                    x 0
+                    y 142
+            }
+            back {
+                    image button.png
+                    x 112
+                    y 142
+            }
+            dpad-up {
+                    image arrow_up.png
+                    x 77
+                    y 53
+            }
+            dpad-down {
+                    image arrow_down.png
+                    x 77
+                    y 106
+            }
+            dpad-left {
+                    image arrow_left.png
+                    x 53
+                    y 53
+            }
+            dpad-right {
+                    image arrow_right.png
+                    x 123
+                    y 53
+            }
+            dpad-center {
+                    image select.png
+                    x 77
+                    y 81
+            }
+            phone-dial {
+                    image button.png
+                    x 0
+                    y 71
+            }
+            phone-hangup {
+                    image button.png
+                    x 168
+                    y 71
+            }
+
+            power {
+                    image button.png
+                    x 168
+                    y 0
+            }
+
+            volume-up {
+                    image button.png
+                    x 112
+                    y 0
+            }
+
+            volume-down {
+                    image button.png
+                    x 56
+                    y 0
+            }
+
+            search {
+                    image button.png
+                    x 168
+                    y 142
+            }
+
+        }
+    }
+
+    keyboard {
+        background {
+            image   keyboard.png
+        }
+        buttons {
+            1 {
+                image  key.png
+                x  5
+                y  5
+            }
+            2 {
+                image  key.png
+                x 42
+                y 5
+            }
+            3 {
+                image  key.png
+                x 79
+                y 5
+            }
+            4 {
+                image  key.png
+                x 116
+                y 5
+            }
+            5 {
+                image  key.png
+                x 153
+                y 5
+            }
+            6 {
+                image  key.png
+                x 190
+                y 5
+            }
+            7 {
+                image  key.png
+                x 227
+                y 5
+            }
+            8 {
+                image  key.png
+                x 264
+                y 5
+            }
+            9 {
+                image  key.png
+                x 301
+                y 5
+            }
+            0 {
+                image  key.png
+                x 338
+                y 5
+            }
+
+            q {
+                image  key.png
+                x  5
+                y  41
+            }
+            w {
+                image  key.png
+                x 42
+                y 41
+            }
+            e {
+                image  key.png
+                x 79
+                y 41
+            }
+            r {
+                image  key.png
+                x 116
+                y 41
+            }
+            t {
+                image  key.png
+                x 153
+                y 41
+            }
+            y {
+                image  key.png
+                x 190
+                y 41
+            }
+            u {
+                image  key.png
+                x 227
+                y 41
+            }
+            i {
+                image  key.png
+                x 264
+                y 41
+            }
+            o {
+                image  key.png
+                x 301
+                y 41
+            }
+            p {
+                image  key.png
+                x 338
+                y 41
+            }
+
+            a {
+                image  key.png
+                x  5
+                y 77
+            }
+            s {
+                image  key.png
+                x 42
+                y 77
+            }
+            d {
+                image  key.png
+                x 79
+                y 77
+            }
+            f {
+                image  key.png
+                x 116
+                y 77
+            }
+            g {
+                image  key.png
+                x 153
+                y 77
+            }
+            h {
+                image  key.png
+                x 190
+                y 77
+            }
+            j {
+                image  key.png
+                x 227
+                y 77
+            }
+            k {
+                image  key.png
+                x 264
+                y 77
+            }
+            l {
+                image  key.png
+                x 301
+                y 77
+            }
+            DEL {
+                image  key.png
+                x 338
+                y 77
+            }
+
+            CAP {
+                image  key.png
+                x  5
+                y 113
+            }
+            z {
+                image  key.png
+                x 42
+                y 113
+            }
+            x {
+                image  key.png
+                x 79
+                y 113
+            }
+            c {
+                image  key.png
+                x 116
+                y 113
+            }
+            v {
+                image  key.png
+                x 153
+                y 113
+            }
+            b {
+                image  key.png
+                x 190
+                y 113
+            }
+            n {
+                image  key.png
+                x 227
+                y 113
+            }
+            m {
+                image  key.png
+                x 264
+                y 113
+            }
+            PERIOD {
+                image  key.png
+                x 301
+                y 113
+            }
+            ENTER {
+                image  key.png
+                x 338
+                y 113
+            }
+
+            ALT {
+                image  key.png
+                x  5
+                y 149
+            }
+            SYM {
+                image  key.png
+                x 42
+                y 149
+            }
+            AT {
+                image  key.png
+                x 79
+                y 149
+            }
+            SPACE {
+                image  spacebar.png
+                x 116
+                y 149
+            }
+            SLASH {
+                image  key.png
+                x 264
+                y 149
+            }
+            COMMA {
+                image  key.png
+                x 301
+                y 149
+            }
+            ALT2 {
+                image  key.png
+                x 338
+                y 149
+            }
+
+        }
+    }
+}
+
+layouts {
+    portrait {
+        width     950
+        height    908
+        color     0xe0e0e0
+        event     EV_SW:0:1
+        
+        part1 {
+            name    portrait
+            x       0
+            y       0
+        }
+
+        part2 {
+            name    landscape
+            x       1000
+            y       0
+        }
+
+        part3 {
+            name    device
+            x       27
+            y       27
+        }
+        part4 {
+            name    controls
+            x       635
+            y       234
+        }
+        part5 {
+            name    keyboard
+            x       554
+            y       486
+        }
+
+    }
+
+    landscape {
+        width     907
+        height    761
+        color     0xe0e0e0
+        event     EV_SW:0:0
+
+        dpad-rotation 3
+
+        part1 {
+            name    portrait
+            x       900
+            y       0
+        }
+
+        part2 {
+            name    landscape
+            x       0
+            y       0
+        }
+
+        part3 {
+            name      device
+            x         26
+            y         509
+            rotation  3
+        }
+
+        part4 {
+            name     controls
+            x        567
+            y        556
+        }
+
+        part5 {
+            name     keyboard
+            x        126
+            y        556
+        }
+    }
+}
+
+keyboard {
+    charmap qwerty2
+}
+
+network {
+    speed  full
+    delay  none
+}
diff --git a/tools/emulator/skins/WVGA854/select.png b/tools/emulator/skins/WVGA854/select.png
new file mode 100644
index 0000000..f4a65d3
--- /dev/null
+++ b/tools/emulator/skins/WVGA854/select.png
Binary files differ
diff --git a/tools/emulator/skins/WVGA854/spacebar.png b/tools/emulator/skins/WVGA854/spacebar.png
new file mode 100644
index 0000000..aa459bd
--- /dev/null
+++ b/tools/emulator/skins/WVGA854/spacebar.png
Binary files differ