From 736859c6e7c7eeaa917b2ca2e0ee5fecff2d0865 Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Fri, 24 Jul 2015 20:35:54 +0900 Subject: [PATCH] skin: modified profile skin packaging profile skins categorized on Makefile Change-Id: I5c535c92c2c796c595042f3df0df5d6252812511 Signed-off-by: GiWoong Kim --- package/build.macos-64 | 12 +++--------- package/build.ubuntu-32 | 12 +++--------- package/build.ubuntu-64 | 12 +++--------- package/build.windows-32 | 12 +++--------- tizen/src/Makefile | 9 ++++++++- .../{ => mobile}/mobile-480x800-3btn/default_0.png | Bin .../mobile-480x800-3btn/default_0_p.png | Bin .../mobile-480x800-3btn/default_180.png | Bin .../mobile-480x800-3btn/default_180_p.png | Bin .../mobile-480x800-3btn/default_L90.png | Bin .../mobile-480x800-3btn/default_L90_p.png | Bin .../mobile-480x800-3btn/default_R90.png | Bin .../mobile-480x800-3btn/default_R90_p.png | Bin .../skins/{ => mobile}/mobile-480x800-3btn/info.ini | 0 .../{ => mobile}/mobile-480x800-3btn/layout.xml | 0 .../{ => mobile}/mobile-540x960-3btn/default_0.png | Bin .../mobile-540x960-3btn/default_0_p.png | Bin .../mobile-540x960-3btn/default_180.png | Bin .../mobile-540x960-3btn/default_180_p.png | Bin .../mobile-540x960-3btn/default_L90.png | Bin .../mobile-540x960-3btn/default_L90_p.png | Bin .../mobile-540x960-3btn/default_R90.png | Bin .../mobile-540x960-3btn/default_R90_p.png | Bin .../skins/{ => mobile}/mobile-540x960-3btn/info.ini | 0 .../{ => mobile}/mobile-540x960-3btn/layout.xml | 0 .../{ => mobile}/mobile-720x1280-3btn/default_0.png | Bin .../mobile-720x1280-3btn/default_0_p.png | Bin .../mobile-720x1280-3btn/default_180.png | Bin .../mobile-720x1280-3btn/default_180_p.png | Bin .../mobile-720x1280-3btn/default_L90.png | Bin .../mobile-720x1280-3btn/default_L90_p.png | Bin .../mobile-720x1280-3btn/default_R90.png | Bin .../mobile-720x1280-3btn/default_R90_p.png | Bin .../{ => mobile}/mobile-720x1280-3btn/info.ini | 0 .../{ => mobile}/mobile-720x1280-3btn/layout.xml | 0 .../controller/key-window/layout.xml | 0 .../skins/{ => mobile}/mobile-general-3btn/info.ini | 0 .../{ => mobile}/mobile-general-3btn/layout.xml | 0 .../skins/{ => tv}/tv-1920x1080/background.png | Bin .../controller/Basic(US)/basic_US_normal.png | Bin .../controller/Basic(US)/basic_US_pushed.png | Bin .../tv-1920x1080/controller/Basic(US)/info.ini | 0 .../tv-1920x1080/controller/Basic(US)/layout.xml | 0 .../resource/skins/{ => tv}/tv-1920x1080/info.ini | 0 .../resource/skins/{ => tv}/tv-1920x1080/layout.xml | 0 .../wearable-320x320-1btn/default_0.png | Bin .../wearable-320x320-1btn/default_0_p.png | Bin .../wearable-320x320-1btn/default_180.png | Bin .../wearable-320x320-1btn/default_180_p.png | Bin .../wearable-320x320-1btn/default_L90.png | Bin .../wearable-320x320-1btn/default_L90_p.png | Bin .../wearable-320x320-1btn/default_R90.png | Bin .../wearable-320x320-1btn/default_R90_p.png | Bin .../{ => wearable}/wearable-320x320-1btn/info.ini | 0 .../{ => wearable}/wearable-320x320-1btn/layout.xml | 0 .../wearable-360x480-1btn/default_0.png | Bin .../wearable-360x480-1btn/default_0_p.png | Bin .../wearable-360x480-1btn/default_180.png | Bin .../wearable-360x480-1btn/default_180_p.png | Bin .../wearable-360x480-1btn/default_L90.png | Bin .../wearable-360x480-1btn/default_L90_p.png | Bin .../wearable-360x480-1btn/default_R90.png | Bin .../wearable-360x480-1btn/default_R90_p.png | Bin .../{ => wearable}/wearable-360x480-1btn/info.ini | 0 .../{ => wearable}/wearable-360x480-1btn/layout.xml | 0 .../controller/key-window/layout.xml | 0 .../{ => wearable}/wearable-general-1btn/info.ini | 0 .../{ => wearable}/wearable-general-1btn/layout.xml | 0 68 files changed, 20 insertions(+), 37 deletions(-) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-480x800-3btn/default_0.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-480x800-3btn/default_0_p.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-480x800-3btn/default_180.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-480x800-3btn/default_180_p.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-480x800-3btn/default_L90.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-480x800-3btn/default_L90_p.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-480x800-3btn/default_R90.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-480x800-3btn/default_R90_p.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-480x800-3btn/info.ini (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-480x800-3btn/layout.xml (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-540x960-3btn/default_0.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-540x960-3btn/default_0_p.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-540x960-3btn/default_180.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-540x960-3btn/default_180_p.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-540x960-3btn/default_L90.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-540x960-3btn/default_L90_p.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-540x960-3btn/default_R90.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-540x960-3btn/default_R90_p.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-540x960-3btn/info.ini (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-540x960-3btn/layout.xml (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-720x1280-3btn/default_0.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-720x1280-3btn/default_0_p.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-720x1280-3btn/default_180.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-720x1280-3btn/default_180_p.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-720x1280-3btn/default_L90.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-720x1280-3btn/default_L90_p.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-720x1280-3btn/default_R90.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-720x1280-3btn/default_R90_p.png (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-720x1280-3btn/info.ini (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-720x1280-3btn/layout.xml (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-general-3btn/controller/key-window/layout.xml (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-general-3btn/info.ini (100%) rename tizen/src/ui/resource/skins/{ => mobile}/mobile-general-3btn/layout.xml (100%) rename tizen/src/ui/resource/skins/{ => tv}/tv-1920x1080/background.png (100%) rename tizen/src/ui/resource/skins/{ => tv}/tv-1920x1080/controller/Basic(US)/basic_US_normal.png (100%) rename tizen/src/ui/resource/skins/{ => tv}/tv-1920x1080/controller/Basic(US)/basic_US_pushed.png (100%) rename tizen/src/ui/resource/skins/{ => tv}/tv-1920x1080/controller/Basic(US)/info.ini (100%) rename tizen/src/ui/resource/skins/{ => tv}/tv-1920x1080/controller/Basic(US)/layout.xml (100%) rename tizen/src/ui/resource/skins/{ => tv}/tv-1920x1080/info.ini (100%) rename tizen/src/ui/resource/skins/{ => tv}/tv-1920x1080/layout.xml (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-320x320-1btn/default_0.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-320x320-1btn/default_0_p.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-320x320-1btn/default_180.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-320x320-1btn/default_180_p.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-320x320-1btn/default_L90.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-320x320-1btn/default_L90_p.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-320x320-1btn/default_R90.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-320x320-1btn/default_R90_p.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-320x320-1btn/info.ini (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-320x320-1btn/layout.xml (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-360x480-1btn/default_0.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-360x480-1btn/default_0_p.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-360x480-1btn/default_180.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-360x480-1btn/default_180_p.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-360x480-1btn/default_L90.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-360x480-1btn/default_L90_p.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-360x480-1btn/default_R90.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-360x480-1btn/default_R90_p.png (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-360x480-1btn/info.ini (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-360x480-1btn/layout.xml (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-general-1btn/controller/key-window/layout.xml (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-general-1btn/info.ini (100%) rename tizen/src/ui/resource/skins/{ => wearable}/wearable-general-1btn/layout.xml (100%) diff --git a/package/build.macos-64 b/package/build.macos-64 index eaa0459ffe..77d98fa4fa 100755 --- a/package/build.macos-64 +++ b/package/build.macos-64 @@ -128,15 +128,9 @@ install() mv common $COMMON_BIN_DIR/emulator #profile skins - SRC_SKIN_PATH=src/ui/resource/skins - cp -pPR $SRC_SKIN_PATH/mobile-general-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/mobile-480x800-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/mobile-540x960-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/mobile-720x1280-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/wearable-general-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/wearable-320x320-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/wearable-360x480-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/tv-1920x1080 $TV_2_4_SKIN_RESOURCE_DIR/ + mv skins/mobile/* $MOBILE_2_4_SKIN_RESOURCE_DIR + mv skins/wearable/* $WEARABLE_2_4_SKIN_RESOURCE_DIR + mv skins/tv/* $TV_2_4_SKIN_RESOURCE_DIR } [ "$1" = "clean" ] && clean diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32 index f16fa9cdca..a41aed96d8 100755 --- a/package/build.ubuntu-32 +++ b/package/build.ubuntu-32 @@ -87,15 +87,9 @@ install() mv common $COMMON_BIN_DIR/emulator #profile skins - SRC_SKIN_PATH=src/ui/resource/skins - cp -pPR $SRC_SKIN_PATH/mobile-general-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/mobile-480x800-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/mobile-540x960-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/mobile-720x1280-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/wearable-general-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/wearable-320x320-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/wearable-360x480-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/tv-1920x1080 $TV_2_4_SKIN_RESOURCE_DIR/ + mv skins/mobile/* $MOBILE_2_4_SKIN_RESOURCE_DIR + mv skins/wearable/* $WEARABLE_2_4_SKIN_RESOURCE_DIR + mv skins/tv/* $TV_2_4_SKIN_RESOURCE_DIR } [ "$1" = "clean" ] && clean diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64 index 63b6cae8d7..241c1e24d3 100755 --- a/package/build.ubuntu-64 +++ b/package/build.ubuntu-64 @@ -87,15 +87,9 @@ install() mv common $COMMON_BIN_DIR/emulator #profile skins - SRC_SKIN_PATH=src/ui/resource/skins - cp -pPR $SRC_SKIN_PATH/mobile-general-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/mobile-480x800-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/mobile-540x960-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/mobile-720x1280-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/wearable-general-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/wearable-320x320-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/wearable-360x480-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/tv-1920x1080 $TV_2_4_SKIN_RESOURCE_DIR/ + mv skins/mobile/* $MOBILE_2_4_SKIN_RESOURCE_DIR + mv skins/wearable/* $WEARABLE_2_4_SKIN_RESOURCE_DIR + mv skins/tv/* $TV_2_4_SKIN_RESOURCE_DIR } [ "$1" = "clean" ] && clean diff --git a/package/build.windows-32 b/package/build.windows-32 index 4a1d3d8ea1..6621ef7bc6 100755 --- a/package/build.windows-32 +++ b/package/build.windows-32 @@ -92,15 +92,9 @@ install() mv common $COMMON_BIN_DIR/emulator #profile skins - SRC_SKIN_PATH=src/ui/resource/skins - cp -pPR $SRC_SKIN_PATH/mobile-general-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/mobile-480x800-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/mobile-540x960-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/mobile-720x1280-3btn $MOBILE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/wearable-general-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/wearable-320x320-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/wearable-360x480-1btn $WEARABLE_2_4_SKIN_RESOURCE_DIR/ - cp -pPR $SRC_SKIN_PATH/tv-1920x1080 $TV_2_4_SKIN_RESOURCE_DIR/ + mv skins/mobile/* $MOBILE_2_4_SKIN_RESOURCE_DIR + mv skins/wearable/* $WEARABLE_2_4_SKIN_RESOURCE_DIR + mv skins/tv/* $TV_2_4_SKIN_RESOURCE_DIR } [ "$1" = "clean" ] && clean diff --git a/tizen/src/Makefile b/tizen/src/Makefile index 24cf315cb6..757fb04777 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -2,6 +2,7 @@ EMUL_DIR=../emulator DIBS_X86_DIR=../x86 DIBS_ARM_DIR=../arm DIBS_COMMON_DIR=../common +DIBS_SKINS_DIR=../skins ifeq ($(CC),"") @echo "cc does not exist" @@ -179,7 +180,6 @@ endif # resources and jar for skin ifdef CONFIG_JAVA_UI cp -pP skin/client/emulator-skin.jar $(EMUL_DIR)/bin - cp -pPR skin/client/skins $(EMUL_DIR) endif ifdef CONFIG_QT @@ -282,6 +282,9 @@ install_dibs: all_dibs mkdir -p $(DIBS_X86_DIR)/data mkdir -p $(DIBS_X86_DIR)/etc mkdir -p $(DIBS_ARM_DIR)/bin + mkdir -p $(DIBS_SKINS_DIR)/mobile + mkdir -p $(DIBS_SKINS_DIR)/wearable + mkdir -p $(DIBS_SKINS_DIR)/tv @for target in $(TARGET_DIRS); do \ case "$$target" in \ i386-softmmu) \ @@ -318,6 +321,10 @@ ifdef CONFIG_QT ifdef CONFIG_DARWIN cp -pP ui/resource/icons/emulator_icon.ico $(DIBS_COMMON_DIR)/icons endif + + cp -pPR ui/resource/skins/mobile $(DIBS_SKINS_DIR) + cp -pPR ui/resource/skins/wearable $(DIBS_SKINS_DIR) + cp -pPR ui/resource/skins/tv $(DIBS_SKINS_DIR) endif # check capabilities of OpenGL, Webcam and proxy diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_0.png b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_0.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-480x800-3btn/default_0.png rename to tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_0.png diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_0_p.png b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_0_p.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-480x800-3btn/default_0_p.png rename to tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_0_p.png diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_180.png b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_180.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-480x800-3btn/default_180.png rename to tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_180.png diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_180_p.png b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_180_p.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-480x800-3btn/default_180_p.png rename to tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_180_p.png diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_L90.png b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_L90.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-480x800-3btn/default_L90.png rename to tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_L90.png diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_L90_p.png b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_L90_p.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-480x800-3btn/default_L90_p.png rename to tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_L90_p.png diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_R90.png b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_R90.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-480x800-3btn/default_R90.png rename to tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_R90.png diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/default_R90_p.png b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_R90_p.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-480x800-3btn/default_R90_p.png rename to tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/default_R90_p.png diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/info.ini b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/info.ini similarity index 100% rename from tizen/src/ui/resource/skins/mobile-480x800-3btn/info.ini rename to tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/info.ini diff --git a/tizen/src/ui/resource/skins/mobile-480x800-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/layout.xml similarity index 100% rename from tizen/src/ui/resource/skins/mobile-480x800-3btn/layout.xml rename to tizen/src/ui/resource/skins/mobile/mobile-480x800-3btn/layout.xml diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_0.png b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_0.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-540x960-3btn/default_0.png rename to tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_0.png diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_0_p.png b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_0_p.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-540x960-3btn/default_0_p.png rename to tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_0_p.png diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_180.png b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_180.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-540x960-3btn/default_180.png rename to tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_180.png diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_180_p.png b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_180_p.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-540x960-3btn/default_180_p.png rename to tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_180_p.png diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_L90.png b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_L90.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-540x960-3btn/default_L90.png rename to tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_L90.png diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_L90_p.png b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_L90_p.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-540x960-3btn/default_L90_p.png rename to tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_L90_p.png diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_R90.png b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_R90.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-540x960-3btn/default_R90.png rename to tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_R90.png diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/default_R90_p.png b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_R90_p.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-540x960-3btn/default_R90_p.png rename to tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/default_R90_p.png diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/info.ini b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/info.ini similarity index 100% rename from tizen/src/ui/resource/skins/mobile-540x960-3btn/info.ini rename to tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/info.ini diff --git a/tizen/src/ui/resource/skins/mobile-540x960-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/layout.xml similarity index 100% rename from tizen/src/ui/resource/skins/mobile-540x960-3btn/layout.xml rename to tizen/src/ui/resource/skins/mobile/mobile-540x960-3btn/layout.xml diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_0.png b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_0.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_0.png rename to tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_0.png diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_0_p.png b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_0_p.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_0_p.png rename to tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_0_p.png diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_180.png b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_180.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_180.png rename to tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_180.png diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_180_p.png b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_180_p.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_180_p.png rename to tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_180_p.png diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_L90.png b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_L90.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_L90.png rename to tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_L90.png diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_L90_p.png b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_L90_p.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_L90_p.png rename to tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_L90_p.png diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_R90.png b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_R90.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_R90.png rename to tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_R90.png diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_R90_p.png b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_R90_p.png similarity index 100% rename from tizen/src/ui/resource/skins/mobile-720x1280-3btn/default_R90_p.png rename to tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/default_R90_p.png diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/info.ini b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/info.ini similarity index 100% rename from tizen/src/ui/resource/skins/mobile-720x1280-3btn/info.ini rename to tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/info.ini diff --git a/tizen/src/ui/resource/skins/mobile-720x1280-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/layout.xml similarity index 100% rename from tizen/src/ui/resource/skins/mobile-720x1280-3btn/layout.xml rename to tizen/src/ui/resource/skins/mobile/mobile-720x1280-3btn/layout.xml diff --git a/tizen/src/ui/resource/skins/mobile-general-3btn/controller/key-window/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/controller/key-window/layout.xml similarity index 100% rename from tizen/src/ui/resource/skins/mobile-general-3btn/controller/key-window/layout.xml rename to tizen/src/ui/resource/skins/mobile/mobile-general-3btn/controller/key-window/layout.xml diff --git a/tizen/src/ui/resource/skins/mobile-general-3btn/info.ini b/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/info.ini similarity index 100% rename from tizen/src/ui/resource/skins/mobile-general-3btn/info.ini rename to tizen/src/ui/resource/skins/mobile/mobile-general-3btn/info.ini diff --git a/tizen/src/ui/resource/skins/mobile-general-3btn/layout.xml b/tizen/src/ui/resource/skins/mobile/mobile-general-3btn/layout.xml similarity index 100% rename from tizen/src/ui/resource/skins/mobile-general-3btn/layout.xml rename to tizen/src/ui/resource/skins/mobile/mobile-general-3btn/layout.xml diff --git a/tizen/src/ui/resource/skins/tv-1920x1080/background.png b/tizen/src/ui/resource/skins/tv/tv-1920x1080/background.png similarity index 100% rename from tizen/src/ui/resource/skins/tv-1920x1080/background.png rename to tizen/src/ui/resource/skins/tv/tv-1920x1080/background.png diff --git a/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/basic_US_normal.png b/tizen/src/ui/resource/skins/tv/tv-1920x1080/controller/Basic(US)/basic_US_normal.png similarity index 100% rename from tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/basic_US_normal.png rename to tizen/src/ui/resource/skins/tv/tv-1920x1080/controller/Basic(US)/basic_US_normal.png diff --git a/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/basic_US_pushed.png b/tizen/src/ui/resource/skins/tv/tv-1920x1080/controller/Basic(US)/basic_US_pushed.png similarity index 100% rename from tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/basic_US_pushed.png rename to tizen/src/ui/resource/skins/tv/tv-1920x1080/controller/Basic(US)/basic_US_pushed.png diff --git a/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/info.ini b/tizen/src/ui/resource/skins/tv/tv-1920x1080/controller/Basic(US)/info.ini similarity index 100% rename from tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/info.ini rename to tizen/src/ui/resource/skins/tv/tv-1920x1080/controller/Basic(US)/info.ini diff --git a/tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/layout.xml b/tizen/src/ui/resource/skins/tv/tv-1920x1080/controller/Basic(US)/layout.xml similarity index 100% rename from tizen/src/ui/resource/skins/tv-1920x1080/controller/Basic(US)/layout.xml rename to tizen/src/ui/resource/skins/tv/tv-1920x1080/controller/Basic(US)/layout.xml diff --git a/tizen/src/ui/resource/skins/tv-1920x1080/info.ini b/tizen/src/ui/resource/skins/tv/tv-1920x1080/info.ini similarity index 100% rename from tizen/src/ui/resource/skins/tv-1920x1080/info.ini rename to tizen/src/ui/resource/skins/tv/tv-1920x1080/info.ini diff --git a/tizen/src/ui/resource/skins/tv-1920x1080/layout.xml b/tizen/src/ui/resource/skins/tv/tv-1920x1080/layout.xml similarity index 100% rename from tizen/src/ui/resource/skins/tv-1920x1080/layout.xml rename to tizen/src/ui/resource/skins/tv/tv-1920x1080/layout.xml diff --git a/tizen/src/ui/resource/skins/wearable-320x320-1btn/default_0.png b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_0.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-320x320-1btn/default_0.png rename to tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_0.png diff --git a/tizen/src/ui/resource/skins/wearable-320x320-1btn/default_0_p.png b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_0_p.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-320x320-1btn/default_0_p.png rename to tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_0_p.png diff --git a/tizen/src/ui/resource/skins/wearable-320x320-1btn/default_180.png b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_180.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-320x320-1btn/default_180.png rename to tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_180.png diff --git a/tizen/src/ui/resource/skins/wearable-320x320-1btn/default_180_p.png b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_180_p.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-320x320-1btn/default_180_p.png rename to tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_180_p.png diff --git a/tizen/src/ui/resource/skins/wearable-320x320-1btn/default_L90.png b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_L90.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-320x320-1btn/default_L90.png rename to tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_L90.png diff --git a/tizen/src/ui/resource/skins/wearable-320x320-1btn/default_L90_p.png b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_L90_p.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-320x320-1btn/default_L90_p.png rename to tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_L90_p.png diff --git a/tizen/src/ui/resource/skins/wearable-320x320-1btn/default_R90.png b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_R90.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-320x320-1btn/default_R90.png rename to tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_R90.png diff --git a/tizen/src/ui/resource/skins/wearable-320x320-1btn/default_R90_p.png b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_R90_p.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-320x320-1btn/default_R90_p.png rename to tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/default_R90_p.png diff --git a/tizen/src/ui/resource/skins/wearable-320x320-1btn/info.ini b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/info.ini similarity index 100% rename from tizen/src/ui/resource/skins/wearable-320x320-1btn/info.ini rename to tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/info.ini diff --git a/tizen/src/ui/resource/skins/wearable-320x320-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/layout.xml similarity index 100% rename from tizen/src/ui/resource/skins/wearable-320x320-1btn/layout.xml rename to tizen/src/ui/resource/skins/wearable/wearable-320x320-1btn/layout.xml diff --git a/tizen/src/ui/resource/skins/wearable-360x480-1btn/default_0.png b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_0.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-360x480-1btn/default_0.png rename to tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_0.png diff --git a/tizen/src/ui/resource/skins/wearable-360x480-1btn/default_0_p.png b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_0_p.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-360x480-1btn/default_0_p.png rename to tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_0_p.png diff --git a/tizen/src/ui/resource/skins/wearable-360x480-1btn/default_180.png b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_180.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-360x480-1btn/default_180.png rename to tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_180.png diff --git a/tizen/src/ui/resource/skins/wearable-360x480-1btn/default_180_p.png b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_180_p.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-360x480-1btn/default_180_p.png rename to tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_180_p.png diff --git a/tizen/src/ui/resource/skins/wearable-360x480-1btn/default_L90.png b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_L90.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-360x480-1btn/default_L90.png rename to tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_L90.png diff --git a/tizen/src/ui/resource/skins/wearable-360x480-1btn/default_L90_p.png b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_L90_p.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-360x480-1btn/default_L90_p.png rename to tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_L90_p.png diff --git a/tizen/src/ui/resource/skins/wearable-360x480-1btn/default_R90.png b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_R90.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-360x480-1btn/default_R90.png rename to tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_R90.png diff --git a/tizen/src/ui/resource/skins/wearable-360x480-1btn/default_R90_p.png b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_R90_p.png similarity index 100% rename from tizen/src/ui/resource/skins/wearable-360x480-1btn/default_R90_p.png rename to tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/default_R90_p.png diff --git a/tizen/src/ui/resource/skins/wearable-360x480-1btn/info.ini b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/info.ini similarity index 100% rename from tizen/src/ui/resource/skins/wearable-360x480-1btn/info.ini rename to tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/info.ini diff --git a/tizen/src/ui/resource/skins/wearable-360x480-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/layout.xml similarity index 100% rename from tizen/src/ui/resource/skins/wearable-360x480-1btn/layout.xml rename to tizen/src/ui/resource/skins/wearable/wearable-360x480-1btn/layout.xml diff --git a/tizen/src/ui/resource/skins/wearable-general-1btn/controller/key-window/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-general-1btn/controller/key-window/layout.xml similarity index 100% rename from tizen/src/ui/resource/skins/wearable-general-1btn/controller/key-window/layout.xml rename to tizen/src/ui/resource/skins/wearable/wearable-general-1btn/controller/key-window/layout.xml diff --git a/tizen/src/ui/resource/skins/wearable-general-1btn/info.ini b/tizen/src/ui/resource/skins/wearable/wearable-general-1btn/info.ini similarity index 100% rename from tizen/src/ui/resource/skins/wearable-general-1btn/info.ini rename to tizen/src/ui/resource/skins/wearable/wearable-general-1btn/info.ini diff --git a/tizen/src/ui/resource/skins/wearable-general-1btn/layout.xml b/tizen/src/ui/resource/skins/wearable/wearable-general-1btn/layout.xml similarity index 100% rename from tizen/src/ui/resource/skins/wearable-general-1btn/layout.xml rename to tizen/src/ui/resource/skins/wearable/wearable-general-1btn/layout.xml -- 2.34.1