diff --git a/build/sdk.atree b/build/sdk.atree index 40a2876ef..4ae8062cd 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -148,9 +148,10 @@ prebuilt/android-arm/kernel/kernel-qemu platforms/${PLATFORM_NAME}/images/kernel external/qemu/android/avd/hardware-properties.ini tools/lib/hardware-properties.ini # emulator skins -development/emulator/skins/HVGA platforms/${PLATFORM_NAME}/skins/HVGA -development/emulator/skins/QVGA platforms/${PLATFORM_NAME}/skins/QVGA -development/emulator/skins/WVGA platforms/${PLATFORM_NAME}/skins/WVGA +development/emulator/skins/HVGA platforms/${PLATFORM_NAME}/skins/HVGA +development/emulator/skins/QVGA platforms/${PLATFORM_NAME}/skins/QVGA +development/emulator/skins/WVGA800 platforms/${PLATFORM_NAME}/skins/WVGA800 +development/emulator/skins/WVGA854 platforms/${PLATFORM_NAME}/skins/WVGA854 # NOTICE files are copied by build/core/Makefile development/tools/scripts/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/templates/NOTICE.txt diff --git a/emulator/skins/QVGA/.DS_Store b/emulator/skins/QVGA/.DS_Store deleted file mode 100644 index 6aff2f6f9..000000000 Binary files a/emulator/skins/QVGA/.DS_Store and /dev/null differ diff --git a/emulator/skins/QVGA/arrow_down.png b/emulator/skins/QVGA/arrow_down.png index 7398bae87..b9fde223d 100644 Binary files a/emulator/skins/QVGA/arrow_down.png and b/emulator/skins/QVGA/arrow_down.png differ diff --git a/emulator/skins/QVGA/arrow_left.png b/emulator/skins/QVGA/arrow_left.png index f7e3c12fb..281b1923a 100644 Binary files a/emulator/skins/QVGA/arrow_left.png and b/emulator/skins/QVGA/arrow_left.png differ diff --git a/emulator/skins/QVGA/arrow_right.png b/emulator/skins/QVGA/arrow_right.png index 33fa16946..4cbc65d33 100644 Binary files a/emulator/skins/QVGA/arrow_right.png and b/emulator/skins/QVGA/arrow_right.png differ diff --git a/emulator/skins/QVGA/arrow_up.png b/emulator/skins/QVGA/arrow_up.png index f21105a64..29c712151 100644 Binary files a/emulator/skins/QVGA/arrow_up.png and b/emulator/skins/QVGA/arrow_up.png differ diff --git a/emulator/skins/QVGA/back.png b/emulator/skins/QVGA/back.png deleted file mode 100644 index 8519ebd75..000000000 Binary files a/emulator/skins/QVGA/back.png and /dev/null differ diff --git a/emulator/skins/QVGA/background_land.png b/emulator/skins/QVGA/background_land.png new file mode 100644 index 000000000..cb002b51c Binary files /dev/null and b/emulator/skins/QVGA/background_land.png differ diff --git a/emulator/skins/QVGA/background_port.png b/emulator/skins/QVGA/background_port.png new file mode 100644 index 000000000..56316a914 Binary files /dev/null and b/emulator/skins/QVGA/background_port.png differ diff --git a/emulator/skins/QVGA/button.png b/emulator/skins/QVGA/button.png new file mode 100644 index 000000000..8281d20fb Binary files /dev/null and b/emulator/skins/QVGA/button.png differ diff --git a/emulator/skins/QVGA/controls.png b/emulator/skins/QVGA/controls.png new file mode 100644 index 000000000..04b85e2ba Binary files /dev/null and b/emulator/skins/QVGA/controls.png differ diff --git a/emulator/skins/QVGA/device.png b/emulator/skins/QVGA/device.png deleted file mode 100644 index eb6410491..000000000 Binary files a/emulator/skins/QVGA/device.png and /dev/null differ diff --git a/emulator/skins/QVGA/end.png b/emulator/skins/QVGA/end.png deleted file mode 100644 index 8519ebd75..000000000 Binary files a/emulator/skins/QVGA/end.png and /dev/null differ diff --git a/emulator/skins/QVGA/home.png b/emulator/skins/QVGA/home.png deleted file mode 100644 index 8519ebd75..000000000 Binary files a/emulator/skins/QVGA/home.png and /dev/null differ diff --git a/emulator/skins/QVGA/key.png b/emulator/skins/QVGA/key.png index 7a3f563bd..40b03bf3f 100644 Binary files a/emulator/skins/QVGA/key.png and b/emulator/skins/QVGA/key.png differ diff --git a/emulator/skins/QVGA/keyboard.png b/emulator/skins/QVGA/keyboard.png index bb076d315..ca49dcf85 100644 Binary files a/emulator/skins/QVGA/keyboard.png and b/emulator/skins/QVGA/keyboard.png differ diff --git a/emulator/skins/QVGA/layout b/emulator/skins/QVGA/layout index d7539c542..7b3f32833 100644 --- a/emulator/skins/QVGA/layout +++ b/emulator/skins/QVGA/layout @@ -1,84 +1,104 @@ parts { - device { + portrait { background { - image device.png + image background_port.png } + } + landscape { + background { + 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 keyboard - x 360 - y 300 + name landscape + x 800 + y 0 } + + part3 { + name device + x 200 + y 30 + } + part4 { + name controls + x 410 + y 396 + } + part5 { + name keyboard + 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 8519ebd75..000000000 Binary files a/emulator/skins/QVGA/menu.png and /dev/null differ diff --git a/emulator/skins/QVGA/power.png b/emulator/skins/QVGA/power.png deleted file mode 100644 index 0c04cede2..000000000 Binary files a/emulator/skins/QVGA/power.png and /dev/null differ diff --git a/emulator/skins/QVGA/select.png b/emulator/skins/QVGA/select.png index 8691f532b..f4a65d3b5 100644 Binary files a/emulator/skins/QVGA/select.png and b/emulator/skins/QVGA/select.png differ diff --git a/emulator/skins/QVGA/send.png b/emulator/skins/QVGA/send.png deleted file mode 100644 index 8519ebd75..000000000 Binary files a/emulator/skins/QVGA/send.png and /dev/null differ diff --git a/emulator/skins/QVGA/spacebar.png b/emulator/skins/QVGA/spacebar.png index 19fe60476..aa459bd13 100644 Binary files a/emulator/skins/QVGA/spacebar.png and b/emulator/skins/QVGA/spacebar.png differ diff --git a/emulator/skins/QVGA/volume_down.png b/emulator/skins/QVGA/volume_down.png deleted file mode 100644 index 09175b168..000000000 Binary files a/emulator/skins/QVGA/volume_down.png and /dev/null differ diff --git a/emulator/skins/QVGA/volume_up.png b/emulator/skins/QVGA/volume_up.png deleted file mode 100644 index ab52c639b..000000000 Binary files a/emulator/skins/QVGA/volume_up.png and /dev/null differ diff --git a/emulator/skins/WVGA/arrow_down.png b/emulator/skins/WVGA/arrow_down.png deleted file mode 100644 index 19b3764e8..000000000 Binary files a/emulator/skins/WVGA/arrow_down.png and /dev/null differ diff --git a/emulator/skins/WVGA/arrow_left.png b/emulator/skins/WVGA/arrow_left.png deleted file mode 100644 index 113e58427..000000000 Binary files a/emulator/skins/WVGA/arrow_left.png and /dev/null differ diff --git a/emulator/skins/WVGA/arrow_right.png b/emulator/skins/WVGA/arrow_right.png deleted file mode 100644 index ffe3356c0..000000000 Binary files a/emulator/skins/WVGA/arrow_right.png and /dev/null differ diff --git a/emulator/skins/WVGA/arrow_up.png b/emulator/skins/WVGA/arrow_up.png deleted file mode 100644 index 81c54df51..000000000 Binary files a/emulator/skins/WVGA/arrow_up.png and /dev/null differ diff --git a/emulator/skins/WVGA/back.png b/emulator/skins/WVGA/back.png deleted file mode 100644 index 41034d910..000000000 Binary files a/emulator/skins/WVGA/back.png and /dev/null differ diff --git a/emulator/skins/WVGA/device.png b/emulator/skins/WVGA/device.png deleted file mode 100644 index 36572948e..000000000 Binary files a/emulator/skins/WVGA/device.png and /dev/null differ diff --git a/emulator/skins/WVGA/device.pxi b/emulator/skins/WVGA/device.pxi deleted file mode 100644 index a6bc6a059..000000000 Binary files a/emulator/skins/WVGA/device.pxi and /dev/null differ diff --git a/emulator/skins/WVGA/end.png b/emulator/skins/WVGA/end.png deleted file mode 100644 index 6830a603b..000000000 Binary files a/emulator/skins/WVGA/end.png and /dev/null differ diff --git a/emulator/skins/WVGA/home.png b/emulator/skins/WVGA/home.png deleted file mode 100644 index 7d021369b..000000000 Binary files a/emulator/skins/WVGA/home.png and /dev/null differ diff --git a/emulator/skins/WVGA/key.png b/emulator/skins/WVGA/key.png deleted file mode 100644 index 7a3f563bd..000000000 Binary files a/emulator/skins/WVGA/key.png and /dev/null differ diff --git a/emulator/skins/WVGA/keyboard.png b/emulator/skins/WVGA/keyboard.png deleted file mode 100644 index bb076d315..000000000 Binary files a/emulator/skins/WVGA/keyboard.png and /dev/null differ diff --git a/emulator/skins/WVGA/menu.png b/emulator/skins/WVGA/menu.png deleted file mode 100644 index 41034d910..000000000 Binary files a/emulator/skins/WVGA/menu.png and /dev/null differ diff --git a/emulator/skins/WVGA/power.png b/emulator/skins/WVGA/power.png deleted file mode 100644 index 5894288f0..000000000 Binary files a/emulator/skins/WVGA/power.png and /dev/null differ diff --git a/emulator/skins/WVGA/search.png b/emulator/skins/WVGA/search.png deleted file mode 100644 index 41034d910..000000000 Binary files a/emulator/skins/WVGA/search.png and /dev/null differ diff --git a/emulator/skins/WVGA/select.png b/emulator/skins/WVGA/select.png deleted file mode 100644 index 803d49315..000000000 Binary files a/emulator/skins/WVGA/select.png and /dev/null differ diff --git a/emulator/skins/WVGA/send.png b/emulator/skins/WVGA/send.png deleted file mode 100644 index f547c8817..000000000 Binary files a/emulator/skins/WVGA/send.png and /dev/null differ diff --git a/emulator/skins/WVGA/spacebar.png b/emulator/skins/WVGA/spacebar.png deleted file mode 100644 index 19fe60476..000000000 Binary files a/emulator/skins/WVGA/spacebar.png and /dev/null differ diff --git a/emulator/skins/WVGA/volume_down.png b/emulator/skins/WVGA/volume_down.png deleted file mode 100644 index f8a88dec8..000000000 Binary files a/emulator/skins/WVGA/volume_down.png and /dev/null differ diff --git a/emulator/skins/WVGA/volume_up.png b/emulator/skins/WVGA/volume_up.png deleted file mode 100644 index 940457f70..000000000 Binary files a/emulator/skins/WVGA/volume_up.png and /dev/null differ diff --git a/emulator/skins/WVGA800/arrow_down.png b/emulator/skins/WVGA800/arrow_down.png new file mode 100644 index 000000000..b9fde223d Binary files /dev/null and b/emulator/skins/WVGA800/arrow_down.png differ diff --git a/emulator/skins/WVGA800/arrow_left.png b/emulator/skins/WVGA800/arrow_left.png new file mode 100644 index 000000000..281b1923a Binary files /dev/null and b/emulator/skins/WVGA800/arrow_left.png differ diff --git a/emulator/skins/WVGA800/arrow_right.png b/emulator/skins/WVGA800/arrow_right.png new file mode 100644 index 000000000..4cbc65d33 Binary files /dev/null and b/emulator/skins/WVGA800/arrow_right.png differ diff --git a/emulator/skins/WVGA800/arrow_up.png b/emulator/skins/WVGA800/arrow_up.png new file mode 100644 index 000000000..29c712151 Binary files /dev/null and b/emulator/skins/WVGA800/arrow_up.png differ diff --git a/emulator/skins/WVGA800/background_land.png b/emulator/skins/WVGA800/background_land.png new file mode 100644 index 000000000..4967717cd Binary files /dev/null and b/emulator/skins/WVGA800/background_land.png differ diff --git a/emulator/skins/WVGA800/background_port.png b/emulator/skins/WVGA800/background_port.png new file mode 100644 index 000000000..13ef2ea1e Binary files /dev/null and b/emulator/skins/WVGA800/background_port.png differ diff --git a/emulator/skins/WVGA800/button.png b/emulator/skins/WVGA800/button.png new file mode 100644 index 000000000..8281d20fb Binary files /dev/null and b/emulator/skins/WVGA800/button.png differ diff --git a/emulator/skins/WVGA800/controls.png b/emulator/skins/WVGA800/controls.png new file mode 100644 index 000000000..04b85e2ba Binary files /dev/null and b/emulator/skins/WVGA800/controls.png differ diff --git a/emulator/skins/WVGA/hardware.ini b/emulator/skins/WVGA800/hardware.ini similarity index 100% rename from emulator/skins/WVGA/hardware.ini rename to emulator/skins/WVGA800/hardware.ini diff --git a/emulator/skins/WVGA800/key.png b/emulator/skins/WVGA800/key.png new file mode 100644 index 000000000..40b03bf3f Binary files /dev/null and b/emulator/skins/WVGA800/key.png differ diff --git a/emulator/skins/WVGA800/keyboard.png b/emulator/skins/WVGA800/keyboard.png new file mode 100644 index 000000000..ca49dcf85 Binary files /dev/null and b/emulator/skins/WVGA800/keyboard.png differ diff --git a/emulator/skins/WVGA/layout b/emulator/skins/WVGA800/layout similarity index 50% rename from emulator/skins/WVGA/layout rename to emulator/skins/WVGA800/layout index c33c354c2..6037ab8b5 100644 --- a/emulator/skins/WVGA/layout +++ b/emulator/skins/WVGA800/layout @@ -1,89 +1,104 @@ parts { - device { + portrait { background { - image device.png + image background_port.png } + } + landscape { + background { + image background_land.png + } + } + + device { display { width 480 height 800 - x 65 - y 135 + x 0 + y 0 + } + } + + controls { + background { + image controls.png } - buttons { soft-left { - image menu.png - x 222 - y 945 + image button.png + x 56 + y 142 } home { - image home.png - x 106 - y 945 + image button.png + x 0 + y 142 } back { - image back.png - x 341 - y 945 - } - search { - image search.png - x 460 - y 945 + image button.png + x 112 + y 142 } dpad-up { image arrow_up.png - x 260 - y 1019 + x 77 + y 53 } dpad-down { image arrow_down.png - x 260 - y 1081 + x 77 + y 106 } dpad-left { image arrow_left.png - x 223 - y 1023 + x 53 + y 53 } dpad-right { image arrow_right.png - x 343 - y 1023 + x 123 + y 53 } dpad-center { image select.png - x 259 - y 1049 + x 77 + y 81 } phone-dial { - image send.png - x 107 - y 1043 + image button.png + x 0 + y 71 } phone-hangup { - image end.png - x 458 - y 1043 + image button.png + x 168 + y 71 } power { - image power.png - x -10 - y 120 + image button.png + x 168 + y 0 } volume-up { - image volume_up.png - x 570 - y 260 + image button.png + x 112 + y 0 } volume-down { - image volume_down.png - x 570 - y 310 + image button.png + x 56 + y 0 } + + search { + image button.png + x 168 + y 142 + } + } } @@ -94,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 } } @@ -338,39 +353,76 @@ parts { layouts { portrait { - width 975 - height 1080 - color 0xffffff + width 950 + height 854 + color 0xe0e0e0 event EV_SW:0:1 - + part1 { - name device - x 10 - y -70 + name portrait + x 0 + y 0 } + part2 { - name keyboard - x 600 - y 400 + 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 1080 - height 810 - color 0xffffff + width 853 + height 761 + color 0xe0e0e0 event EV_SW:0:0 part1 { + name portrait + x 900 + y 0 + } + + part2 { + name landscape + x 0 + y 0 + } + + part3 { name device - x -70 - y 640 + x 26 + y 509 rotation 3 } - part2 { + + part4 { + name controls + x 539 + y 556 + } + + part5 { name keyboard - x 250 - y 620 + x 98 + y 556 } } } diff --git a/emulator/skins/WVGA800/select.png b/emulator/skins/WVGA800/select.png new file mode 100644 index 000000000..f4a65d3b5 Binary files /dev/null and b/emulator/skins/WVGA800/select.png differ diff --git a/emulator/skins/WVGA800/spacebar.png b/emulator/skins/WVGA800/spacebar.png new file mode 100644 index 000000000..aa459bd13 Binary files /dev/null and b/emulator/skins/WVGA800/spacebar.png differ diff --git a/emulator/skins/WVGA854/arrow_down.png b/emulator/skins/WVGA854/arrow_down.png new file mode 100644 index 000000000..b9fde223d Binary files /dev/null and b/emulator/skins/WVGA854/arrow_down.png differ diff --git a/emulator/skins/WVGA854/arrow_left.png b/emulator/skins/WVGA854/arrow_left.png new file mode 100644 index 000000000..281b1923a Binary files /dev/null and b/emulator/skins/WVGA854/arrow_left.png differ diff --git a/emulator/skins/WVGA854/arrow_right.png b/emulator/skins/WVGA854/arrow_right.png new file mode 100644 index 000000000..4cbc65d33 Binary files /dev/null and b/emulator/skins/WVGA854/arrow_right.png differ diff --git a/emulator/skins/WVGA854/arrow_up.png b/emulator/skins/WVGA854/arrow_up.png new file mode 100644 index 000000000..29c712151 Binary files /dev/null and b/emulator/skins/WVGA854/arrow_up.png differ diff --git a/emulator/skins/WVGA854/background_land.png b/emulator/skins/WVGA854/background_land.png new file mode 100644 index 000000000..4f0f90e94 Binary files /dev/null and b/emulator/skins/WVGA854/background_land.png differ diff --git a/emulator/skins/WVGA854/background_port.png b/emulator/skins/WVGA854/background_port.png new file mode 100644 index 000000000..e35bf6738 Binary files /dev/null and b/emulator/skins/WVGA854/background_port.png differ diff --git a/emulator/skins/WVGA854/button.png b/emulator/skins/WVGA854/button.png new file mode 100644 index 000000000..8281d20fb Binary files /dev/null and b/emulator/skins/WVGA854/button.png differ diff --git a/emulator/skins/WVGA854/controls.png b/emulator/skins/WVGA854/controls.png new file mode 100644 index 000000000..04b85e2ba Binary files /dev/null and b/emulator/skins/WVGA854/controls.png differ diff --git a/emulator/skins/WVGA854/hardware.ini b/emulator/skins/WVGA854/hardware.ini new file mode 100644 index 000000000..02e9d89ee --- /dev/null +++ b/emulator/skins/WVGA854/hardware.ini @@ -0,0 +1,2 @@ +# skin-specific hardware values +hw.lcd.density=240 \ No newline at end of file diff --git a/emulator/skins/WVGA854/key.png b/emulator/skins/WVGA854/key.png new file mode 100644 index 000000000..40b03bf3f Binary files /dev/null and b/emulator/skins/WVGA854/key.png differ diff --git a/emulator/skins/WVGA854/keyboard.png b/emulator/skins/WVGA854/keyboard.png new file mode 100644 index 000000000..ca49dcf85 Binary files /dev/null and b/emulator/skins/WVGA854/keyboard.png differ diff --git a/emulator/skins/WVGA854/layout b/emulator/skins/WVGA854/layout new file mode 100644 index 000000000..ab0784d02 --- /dev/null +++ b/emulator/skins/WVGA854/layout @@ -0,0 +1,437 @@ +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 + + 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/emulator/skins/WVGA854/select.png b/emulator/skins/WVGA854/select.png new file mode 100644 index 000000000..f4a65d3b5 Binary files /dev/null and b/emulator/skins/WVGA854/select.png differ diff --git a/emulator/skins/WVGA854/spacebar.png b/emulator/skins/WVGA854/spacebar.png new file mode 100644 index 000000000..aa459bd13 Binary files /dev/null and b/emulator/skins/WVGA854/spacebar.png differ