update resource

Change-Id: I12d3534cbfa0596170573f78e410b21ee3d05424

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index ea35222..f8d12ce 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -224,270 +224,38 @@ setfattr -n security.capability -v 0sAQAAAgAAAAAAMAAAAAAAAAAAAAA= /usr/sbin/ipta
 # Set vconf values with -g/-u options
 GOPTION="-g 6514"
 
-#Top edit mode
-       #vconftool $GOPTION set -t int file/fixedGrid/grid0  "-1" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t int file/fixedGrid/grid1  "-1" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t int file/fixedGrid/grid2  "-1" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t int file/fixedGrid/grid3  "-1" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t int file/fixedGrid/grid4  "-1" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t int file/fixedGrid/grid5  "-1" -s org.tizen.setting::private
-
-#resetMenuscreen
-       #vconftool $GOPTION set -t string db/setting/menuscreen/package_name "org.tizen.homescreen" -s system::vconf_inhouse
-
-#resetNetwork
-       #vconftool $GOPTION set -t bool db/setting/network_restrict_mode "0" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t int db/setting/select_network "0" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t int db/setting/select_network_act "0" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t int db/setting/network_mode "0" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t bool db/setting/3gEnabled "1" -s system::vconf_system
-       #vconftool $GOPTION set -t bool db/setting/data_roaming "0" -s system::vconf_system
-       #vconftool $GOPTION set -t bool memory/setting/network_mode_changed "0" -i -s system::vconf_system
-       #vconftool $GOPTION set -t bool db/setting/network/mobile_data_on_reminder "1" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t bool db/setting/network/mobile_data_off_reminder "1" -s system::vconf_inhouse
-
-#resetUsbConnectivity
-       #vconftool $GOPTION set -t int memory/setting/usb_mode "-1" -i -s system::vconf_system
-       #vconftool $GOPTION set -t int memory/setting/usb_in_mode_change "0" -i -s org.tizen.setting::private
-       #vconftool $GOPTION set -t bool db/setting/debug_mode "0" -s system::vconf_system
-       #vconftool $GOPTION set -t int db/setting/default_rendering_engine "1" -i -s system::vconf_system
-       #vconftool $GOPTION set -t bool db/setting/developer_option_state "0" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t bool db/setting/show_cpu_info "0" -s system::vconf_system
-
-#resetHighTouch
-       #vconftool $GOPTION set -t bool memory/setting/enhanced_touch "0" -s org.tizen.setting::private
-
 #resetSound
 %ifarch %{arm}
-       DEFAULT_CALL_TONE="/opt/usr/share/settings/Ringtones/Over_the_horizon.ogg"
+       DEFAULT_CALL_TONE="/opt/usr/share/settings/Ringtones/ringtone_sdk.mp3"
 %else
        DEFAULT_CALL_TONE="/opt/usr/share/settings/Ringtones/ringtone_sdk.mp3"
 %endif
 
 %ifarch %{arm}
-       DEFAULT_NOTI_TONE="/opt/usr/share/settings/Alerts/Whistle.ogg"
+       DEFAULT_NOTI_TONE="/opt/usr/share/settings/Alerts/General notification_sdk.wav"
 %else
        DEFAULT_NOTI_TONE="/opt/usr/share/settings/Alerts/General notification_sdk.wav"
 %endif
 
-       #vconftool $GOPTION set -t bool db/setting/sound/sound_on "1" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t bool db/setting/sound/vibration_on "0" -s system::vconf_inhouse
-
-       #vconftool $GOPTION set -t bool db/setting/sound/vibrate_when_ringing "0" -s system::vconf_setting
-       #vconftool $GOPTION set -t bool db/setting/sound/vibrate_when_notification "1" -s system::vconf_setting
-
-       #vconftool $GOPTION set -t int db/setting/sound/noti/vibration_level "5" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t int db/setting/sound/touch_feedback/vibration_level "3" -s system::vconf_inhouse
-
-       #vconftool $GOPTION set -t string db/setting/sound/call/ringtone_path "${DEFAULT_CALL_TONE}" -f -s system::vconf_inhouse
-       #vconftool $GOPTION set -t string db/setting/sound/call/ringtone_default_path "${DEFAULT_CALL_TONE}" -f -s system::vconf_setting
-       #vconftool $GOPTION set -t string db/setting/sound/noti/msg_ringtone_path       "${DEFAULT_NOTI_TONE}" -f -s system::vconf_inhouse
-       #vconftool $GOPTION set -t string db/setting/sound/noti/ringtone_default_path   "${DEFAULT_NOTI_TONE}" -f -s system::vconf_inhouse
-       #vconftool $GOPTION set -t int db/setting/sound/noti/msg_alert_rep_type         "0" -s system::vconf_inhouse
-
-       #vconftool $GOPTION set -t string db/setting/sound/noti/email_ringtone_path     "${DEFAULT_NOTI_TONE}" -f -s system::vconf_inhouse
-
-       #vconftool $GOPTION set -t bool db/setting/sound/button_sounds "1" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t bool db/setting/sound/touch_sounds "1" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t bool db/setting/sound/sound_lock "1" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t bool db/setting/sound/haptic_feedback_on "0" -s system::vconf_inhouse
-
 #resetSound
 %ifarch %{arm}
-       DEFAULT_HOME="/opt/usr/share/settings/Wallpapers/Home_default.png"
-       DEFAULT_LOCK="/opt/usr/share/settings/Wallpapers/Lock_default.png"
-%else
-       # for emulator
        DEFAULT_HOME="/opt/usr/share/settings/Wallpapers/Home_default.jpg"
        DEFAULT_LOCK="/opt/usr/share/settings/Wallpapers/Default.jpg"
-%endif
-
-       #vconftool $GOPTION set -t string db/menu_widget/bgset "${DEFAULT_HOME}" -f -s system::vconf_setting
-       #vconftool $GOPTION set -t string db/idle_lock/bgset "${DEFAULT_LOCK}" -f -s system::vconf_setting
-
-#resetTilt
-       #vconftool $GOPTION set -t bool db/setting/use_tilt "0" -s system::vconf_inhouse
-
-#resetPanning
-       #vconftool $GOPTION set -t bool db/setting/use_panning "0" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t int db/setting/panning_sensitivity "3" -s system::vconf_setting
-       #vconftool $GOPTION set -t bool db/setting/use_panning_browser "0" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t int db/setting/panning_browser_sensitivity "3" -s org.tizen.setting::private
 
-#resetDoubleTap
-       #vconftool $GOPTION set -t bool db/setting/use_double_tap "0" -s system::vconf_setting
-
-#resetShake
-       #vconftool $GOPTION set -t bool db/setting/use_shake "0" -s system::vconf_inhouse
-
-#resetPickup
-       #vconftool $GOPTION set -t bool db/setting/use_pick_up "1" -s system::vconf_setting
-       #vconftool $GOPTION set -t bool db/setting/use_pick_up_call "1" -s system::vconf_inhouse
-
-#resetTurnOver
-       #vconftool $GOPTION set -t bool db/setting/use_turn_over "0" -s system::vconf_setting
-
-#resetMotions
-       #vconftool $GOPTION set -t bool db/setting/motion_active "1" -s system::vconf_system
-       #vconftool $GOPTION set -t bool db/setting/motion/palm_motion "0" system::vconf_system
-       #vconftool $GOPTION set -t bool db/setting/motion/palm_swipe_capture "1" -s system::vconf_setting
-       #vconftool $GOPTION set -t bool db/setting/motion/tap_twist "1" -s system::vconf_setting
-
-#resetDisplay
-       #backlight
-%ifarch %{arm}
-       #vconftool $GOPTION set -t int db/setting/lcd_backlight_normal "30" -s system::vconf_system
 %else
-       #vconftool $GOPTION set -t int db/setting/lcd_backlight_normal "0" -s system::vconf_system
-%endif
-       #vconftool $GOPTION set -t int db/setting/automatic_brightness_level "50" -f -s system::vconf_inhouse
-       #brightness
-       #vconftool $GOPTION set -t int db/setting/Brightness "100" -s system::vconf_system
-       #vconftool $GOPTION set -t int db/setting/brightness_automatic "0" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t bool db/setting/auto_display_adjustment "1" -s system::vconf_inhouse
-
-       #battery
-       #vconftool $GOPTION set -t bool db/setting/battery_percentage "0" -s system::vconf_inhouse
-
-       #smart screen
-       #vconftool $GOPTION set -t bool db/setting/auto_adjust_screen_tone "1" -s system::vconf_inhouse
-
-       #vconftool $GOPTION set -t int db/setting/display/touchkey_light_duration "90" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t int db/setting/display/screen_capture_destination "0" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t bool db/setting/display/edit_after_screen_capture "0" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t bool db/setting/display/dynamic_status_bar "0" -s system::vconf_inhouse
-
-       #LED indicator
-       #vconftool $GOPTION set -t bool db/setting/led_indicator/charging "1" -s system::vconf_setting
-       #vconftool $GOPTION set -t bool db/setting/led_indicator/low_batt "0" -s system::vconf_setting
-       #vconftool $GOPTION set -t bool db/setting/led_indicator/notifications "1" -s system::vconf_setting
-       #vconftool $GOPTION set -t bool db/setting/led_indicator/voice_rec "1" -s system::vconf_setting
-
-#resetRotationLock
-
-       # to be removed
-       #vconftool $GOPTION set -t bool db/setting/rotate_lock "1"  -s system::vconf_inhouse
-
-       #vconftool $GOPTION set -t bool db/setting/auto_rotate_screen "1" -s system::vconf_inhouse
-
-#resetTimeAndData
-%ifarch %{arm}
-       #vconftool $GOPTION set -t bool db/setting/automatic_time_update "1" -s system::vconf_inhouse
-%else
-       #vconftool $GOPTION set -t bool db/setting/automatic_time_update "0" -s system::vconf_inhouse
+       # for emulator
+       DEFAULT_HOME="/opt/usr/share/settings/Wallpapers/Home_default.jpg"
+       DEFAULT_LOCK="/opt/usr/share/settings/Wallpapers/Default.jpg"
 %endif
 
-       #vconftool $GOPTION set -t int db/menu_widget/regionformat_time1224 "1" -s system::vconf_setting
-       #vconftool $GOPTION set -t int db/setting/date_format "0" -s system::vconf_setting
-       #vconftool $GOPTION set -t int db/setting/weekofday_format  "0" -s system::vconf_inhouse
-
-       #vconftool $GOPTION set -t string db/setting/timezone "+9:00" -s system::vconf_setting
-       # to be removed
-       #vconftool $GOPTION set -t string db/setting/cityname_id "Seoul" -s system::vconf_setting
-
-       #vconftool $GOPTION set -t string db/setting/timezone_id "Asia/Seoul" -s system::vconf_inhouse
-
        rm -f /opt/etc/localtime
        ln -s /usr/share/zoneinfo/Asia/Seoul /opt/etc/localtime
        rm -f /etc/localtime
        ln -s /opt/etc/localtime /etc/localtime
 
-#resetAccessibility
-       #vconftool $GOPTION set -t bool db/setting/accessibility/high_contrast "0" -s system::vconf_system
-       #vconftool $GOPTION set -t bool db/setting/accessibility/screen_zoom "0" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t int db/setting/accessibility/font_size "1" -s system::vconf_misc
-       #vconftool $GOPTION set -t string db/setting/accessibility/font_name "HelveticaNeue" -s system::vconf_misc
-       #vconftool $GOPTION set -t bool db/setting/accessibility/tts "0" -s system::vconf_system
-       #vconftool $GOPTION set -t int db/setting/accessibility/speech_rate "2" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t bool db/setting/accessibility/rapid_key_input "0" -s system::vconf_system
-
-       #vconftool $GOPTION set -t bool memory/setting/accessibility/torch_light "0" -i -s system::vconf_system
-       #vconftool $GOPTION set -t bool db/setting/accessibility/mono_audio "0" -s system::vconf_setting
-       #vconftool $GOPTION set -t int db/setting/accessibility/power_key_hold "1" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t bool db/setting/accessibility/turn_off_all_sounds "0" -s system::vconf_setting
-
-       #vconftool $GOPTION set -t int db/setting/accessibility/lock_time "5" -s system::vconf_setting
-       #vconftool $GOPTION set -t string db/setting/accessibility/taphold_delay "IDS_COM_POP_SHORT" -s system::vconf_setting
-
-#resetLanguageAndRegion
-       #vconftool $GOPTION set -t bool db/setting/lang_automatic "0" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t bool db/setting/region_automatic "1" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t string db/menu_widget/language "en_US.UTF-8" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t string db/menu_widget/regionformat "en_US.UTF-8" -s system::vconf_inhouse
-
 #resetSecurity
        rm -rf /opt/usr/data/setting/set_info
 
-       #vconftool $GOPTION set -t int db/setting/screen_lock_type "1" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t string db/setting/3rd_lock_pkg_name "org.tizen.lockscreen" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t bool db/setting/fmm/sim_change_alert "0" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t string db/setting/fmm/recipients "" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t string db/setting/fmm/sender "" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t string db/setting/fmm/alert_message "" -s system::vconf_inhouse
-
-       # for MMC encryption
-       #vconftool $GOPTION set -t bool db/setting/mmc_encryption/status "0" -s system::vconf_system
-       #vconftool $GOPTION set -t int db/setting/mmc_encryption/option "0" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t bool db/setting/mmc_encryption/exclude_multimedia "0" -s org.tizen.setting::private
-
-#resetMemory
-       #vconftool $GOPTION set -t int db/setting/default_memory/install_applications "0" -s system::vconf_system
-
-       #vconftool $GOPTION set -t int db/setting/default_memory/bluetooth "0" -s system::vconf_system
-
-#resetAbout
-       #vconftool $GOPTION set -t string db/setting/device_name "Tizen" -s system::vconf_network
-
-#resetDevoptions
-       #vconftool $GOPTION -i set -t int db/setting/devoption/bgprocess "0" -s system::vconf_setting
-
-#resetDatausage
-       #vconftool $GOPTION set -t bool db/setting/set_data_usage_limit "0" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t int db/setting/data_limit "-1" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t int db/setting/data_each_month "1" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t int db/setting/data_each_month_app "1" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t int db/setting/data_limit_roaming "-1" -s org.tizen.setting::private
-       #vconftool $GOPTION set -t bool db/setting/set_data_usage_limit_roaming "0" -s org.tizen.setting::private
-
-#resetDisplay
-       #vconftool $GOPTION set -t string db/setting/screenmode/selected_name "Dynamic" -f -s org.tizen.setting::private
-
-#resetMostRecentlySetting
-       #vconftool $GOPTION set -t string db/setting/most_recently_setting "" -s org.tizen.setting::private
-
-#psmode(power saving mode)
-       #vconftool $GOPTION set -t int db/setting/psmode "0" -s system::vconf_setting
-       #vconftool $GOPTION set -t bool db/setting/win_gray "0" -s system::vconf_setting
-       #vconftool $GOPTION set -t bool db/setting/win_fps "0" -s system::vconf_setting
-       #vconftool $GOPTION set -t int db/setting/emergency/mode "1" -s system::vconf_setting
-
-#resetPowersaving
-       #vconftool $GOPTION set -t bool db/setting/pwrsv/system_mode/status "0" -s org.tizen.setting::private
-
-       #v0.4
-        #vconftool $GOPTION set -t bool db/setting/pwrsv/custom_mode/cpu "0" -s system::vconf_inhouse
-
-# personal page(not include on vconf internal yet)
-       #vconftool $GOPTION set -t bool memory/setting/personal "0" -i -s system::vconf_setting
-       #vconftool $GOPTION set -t int db/setting/personal_unlock_method "-1" -s system::vconf_setting
-       #vconftool $GOPTION set -t string db/setting/personal_key "" -s system::vconf_setting
-
-#usb otg
-       #vconftool $GOPTION set -t bool db/setting/usb_otg "1" -s system::vconf_inhouse
-
-#hands-free reminder
-       #vconftool $GOPTION set -t int db/setting/handsfree_sound_reminder "0" -s org.tizen.setting::private
-
-#hands-free reminder
-       #vconftool $GOPTION set -t bool db/setting/firewall "0" -s org.tizen.setting::private
-
-# changeable UI - color theme
-       #vconftool $GOPTION set -t int db/setting/change_ui/theme "0" -s system::vconf_inhouse
-       #vconftool $GOPTION set -t bool db/setting/change_ui/color_theme_wallpaper_set "0" -s system::vconf_inhouse
-
-# multi-window
-       #vconftool $GOPTION set -t bool db/setting/open_via_multi "0" -s system::vconf_setting
-
 #------------------------------------------
 #create directory /opt/usr/data/setting
 #------------------------------------------

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cd311c7..f9bdc05 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -255,7 +255,7 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/images DESTINATION /usr/apps/${SE
 
 # install media-data
 IF("${BUILD_ARCH}" STREQUAL "arm")
-               INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data/settings DESTINATION /opt/usr/share PATTERN "*")
+       INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION /opt/usr/share PATTERN "*")
 ELSE("${BUILD_ARCH}" STREQUAL "arm")
        INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION /opt/usr/share PATTERN "*")
 ENDIF("${BUILD_ARCH}" STREQUAL "arm")