diff --git a/build/sdk.atree b/build/sdk.atree index ad1d19fda..c5d5798cd 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -79,7 +79,8 @@ 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 development/tools/emulator/skins/WSVGA platforms/${PLATFORM_NAME}/skins/WSVGA -development/tools/emulator/skins/WXGA platforms/${PLATFORM_NAME}/skins/WXGA +development/tools/emulator/skins/WXGA720 platforms/${PLATFORM_NAME}/skins/WXGA720 +development/tools/emulator/skins/WXGA800 platforms/${PLATFORM_NAME}/skins/WXGA800 # Platform SDK properties development/sdk/sdk.properties platforms/${PLATFORM_NAME}/sdk.properties diff --git a/tools/emulator/skins/WVGA800/hardware.ini b/tools/emulator/skins/WVGA800/hardware.ini index 19e3b3583..96dee4fb2 100644 --- a/tools/emulator/skins/WVGA800/hardware.ini +++ b/tools/emulator/skins/WVGA800/hardware.ini @@ -1,4 +1,4 @@ # skin-specific hardware values hw.lcd.density=240 vm.heapSize=24 -hw.ramSize=256 \ No newline at end of file +hw.ramSize=512 \ No newline at end of file diff --git a/tools/emulator/skins/WVGA854/hardware.ini b/tools/emulator/skins/WVGA854/hardware.ini index 943428895..6ac3d8229 100644 --- a/tools/emulator/skins/WVGA854/hardware.ini +++ b/tools/emulator/skins/WVGA854/hardware.ini @@ -1,4 +1,4 @@ # skin-specific hardware values hw.lcd.density=240 vm.heapSize=24 -hw.ramSize=256 +hw.ramSize=512 diff --git a/tools/emulator/skins/WXGA/arrow_down.png b/tools/emulator/skins/WXGA720/arrow_down.png similarity index 100% rename from tools/emulator/skins/WXGA/arrow_down.png rename to tools/emulator/skins/WXGA720/arrow_down.png diff --git a/tools/emulator/skins/WXGA/arrow_left.png b/tools/emulator/skins/WXGA720/arrow_left.png similarity index 100% rename from tools/emulator/skins/WXGA/arrow_left.png rename to tools/emulator/skins/WXGA720/arrow_left.png diff --git a/tools/emulator/skins/WXGA/arrow_right.png b/tools/emulator/skins/WXGA720/arrow_right.png similarity index 100% rename from tools/emulator/skins/WXGA/arrow_right.png rename to tools/emulator/skins/WXGA720/arrow_right.png diff --git a/tools/emulator/skins/WXGA/arrow_up.png b/tools/emulator/skins/WXGA720/arrow_up.png similarity index 100% rename from tools/emulator/skins/WXGA/arrow_up.png rename to tools/emulator/skins/WXGA720/arrow_up.png diff --git a/tools/emulator/skins/WXGA720/background_land.png b/tools/emulator/skins/WXGA720/background_land.png new file mode 100755 index 000000000..2aba27e19 Binary files /dev/null and b/tools/emulator/skins/WXGA720/background_land.png differ diff --git a/tools/emulator/skins/WXGA720/background_port.png b/tools/emulator/skins/WXGA720/background_port.png new file mode 100755 index 000000000..9561ca815 Binary files /dev/null and b/tools/emulator/skins/WXGA720/background_port.png differ diff --git a/tools/emulator/skins/WXGA/button.png b/tools/emulator/skins/WXGA720/button.png similarity index 100% rename from tools/emulator/skins/WXGA/button.png rename to tools/emulator/skins/WXGA720/button.png diff --git a/tools/emulator/skins/WXGA/controls.png b/tools/emulator/skins/WXGA720/controls.png similarity index 100% rename from tools/emulator/skins/WXGA/controls.png rename to tools/emulator/skins/WXGA720/controls.png diff --git a/tools/emulator/skins/WXGA720/hardware.ini b/tools/emulator/skins/WXGA720/hardware.ini new file mode 100755 index 000000000..d0e368643 --- /dev/null +++ b/tools/emulator/skins/WXGA720/hardware.ini @@ -0,0 +1,6 @@ +# skin-specific hardware values +hw.lcd.density=320 +vm.heapSize=48 +hw.ramSize=1024 +hw.keyboard.lid=no + diff --git a/tools/emulator/skins/WXGA/key.png b/tools/emulator/skins/WXGA720/key.png similarity index 100% rename from tools/emulator/skins/WXGA/key.png rename to tools/emulator/skins/WXGA720/key.png diff --git a/tools/emulator/skins/WXGA/keyboard.png b/tools/emulator/skins/WXGA720/keyboard.png similarity index 100% rename from tools/emulator/skins/WXGA/keyboard.png rename to tools/emulator/skins/WXGA720/keyboard.png diff --git a/tools/emulator/skins/WXGA720/layout b/tools/emulator/skins/WXGA720/layout new file mode 100755 index 000000000..8332bdc70 --- /dev/null +++ b/tools/emulator/skins/WXGA720/layout @@ -0,0 +1,88 @@ +parts { + portrait { + background { + image background_port.png + } + } + landscape { + background { + image background_land.png + } + } + + device { + display { + width 1280 + height 720 + x 0 + y 0 + } + } + +} + +layouts { + + landscape { + width 1333 + height 775 + color 0xe0e0e0 + event EV_SW:0:1 + + part1 { + name portrait + x 1400 + y 0 + } + + part2 { + name landscape + x 0 + y 0 + } + + part3 { + name device + x 26 + y 29 + } + } + + portrait { + width 773 + height 1334 + color 0xe0e0e0 + event EV_SW:0:0 + + dpad-rotation 3 + + part1 { + name portrait + x 0 + y 0 + } + + part2 { + name landscape + x 1400 + y 0 + } + + part3 { + name device + x 27 + y 1307 + rotation 3 + } + } + +} + +keyboard { + charmap qwerty2 +} + +network { + speed full + delay none +} diff --git a/tools/emulator/skins/WXGA/select.png b/tools/emulator/skins/WXGA720/select.png similarity index 100% rename from tools/emulator/skins/WXGA/select.png rename to tools/emulator/skins/WXGA720/select.png diff --git a/tools/emulator/skins/WXGA/spacebar.png b/tools/emulator/skins/WXGA720/spacebar.png similarity index 100% rename from tools/emulator/skins/WXGA/spacebar.png rename to tools/emulator/skins/WXGA720/spacebar.png diff --git a/tools/emulator/skins/WXGA800/arrow_down.png b/tools/emulator/skins/WXGA800/arrow_down.png new file mode 100755 index 000000000..b9fde223d Binary files /dev/null and b/tools/emulator/skins/WXGA800/arrow_down.png differ diff --git a/tools/emulator/skins/WXGA800/arrow_left.png b/tools/emulator/skins/WXGA800/arrow_left.png new file mode 100755 index 000000000..281b1923a Binary files /dev/null and b/tools/emulator/skins/WXGA800/arrow_left.png differ diff --git a/tools/emulator/skins/WXGA800/arrow_right.png b/tools/emulator/skins/WXGA800/arrow_right.png new file mode 100755 index 000000000..4cbc65d33 Binary files /dev/null and b/tools/emulator/skins/WXGA800/arrow_right.png differ diff --git a/tools/emulator/skins/WXGA800/arrow_up.png b/tools/emulator/skins/WXGA800/arrow_up.png new file mode 100755 index 000000000..29c712151 Binary files /dev/null and b/tools/emulator/skins/WXGA800/arrow_up.png differ diff --git a/tools/emulator/skins/WXGA/background_land.png b/tools/emulator/skins/WXGA800/background_land.png similarity index 100% rename from tools/emulator/skins/WXGA/background_land.png rename to tools/emulator/skins/WXGA800/background_land.png diff --git a/tools/emulator/skins/WXGA/background_port.png b/tools/emulator/skins/WXGA800/background_port.png similarity index 100% rename from tools/emulator/skins/WXGA/background_port.png rename to tools/emulator/skins/WXGA800/background_port.png diff --git a/tools/emulator/skins/WXGA800/button.png b/tools/emulator/skins/WXGA800/button.png new file mode 100755 index 000000000..8281d20fb Binary files /dev/null and b/tools/emulator/skins/WXGA800/button.png differ diff --git a/tools/emulator/skins/WXGA800/controls.png b/tools/emulator/skins/WXGA800/controls.png new file mode 100755 index 000000000..04b85e2ba Binary files /dev/null and b/tools/emulator/skins/WXGA800/controls.png differ diff --git a/tools/emulator/skins/WXGA/hardware.ini b/tools/emulator/skins/WXGA800/hardware.ini similarity index 84% rename from tools/emulator/skins/WXGA/hardware.ini rename to tools/emulator/skins/WXGA800/hardware.ini index c777f9e41..81eac1183 100755 --- a/tools/emulator/skins/WXGA/hardware.ini +++ b/tools/emulator/skins/WXGA800/hardware.ini @@ -1,6 +1,6 @@ # skin-specific hardware values hw.lcd.density=160 vm.heapSize=48 -hw.ramSize=512 +hw.ramSize=1024 hw.keyboard.lid=no diff --git a/tools/emulator/skins/WXGA800/key.png b/tools/emulator/skins/WXGA800/key.png new file mode 100755 index 000000000..40b03bf3f Binary files /dev/null and b/tools/emulator/skins/WXGA800/key.png differ diff --git a/tools/emulator/skins/WXGA800/keyboard.png b/tools/emulator/skins/WXGA800/keyboard.png new file mode 100755 index 000000000..ca49dcf85 Binary files /dev/null and b/tools/emulator/skins/WXGA800/keyboard.png differ diff --git a/tools/emulator/skins/WXGA/layout b/tools/emulator/skins/WXGA800/layout similarity index 100% rename from tools/emulator/skins/WXGA/layout rename to tools/emulator/skins/WXGA800/layout diff --git a/tools/emulator/skins/WXGA800/select.png b/tools/emulator/skins/WXGA800/select.png new file mode 100755 index 000000000..f4a65d3b5 Binary files /dev/null and b/tools/emulator/skins/WXGA800/select.png differ diff --git a/tools/emulator/skins/WXGA800/spacebar.png b/tools/emulator/skins/WXGA800/spacebar.png new file mode 100755 index 000000000..aa459bd13 Binary files /dev/null and b/tools/emulator/skins/WXGA800/spacebar.png differ