Revert "remove unused menu and keys"

This reverts commit 6144523dc854e17a2ac6d703edbf677f7ecfb42c.

Conflicts:

	packaging/org.tizen.setting.spec

- removed setting-memory-efl
- removed the unused key except
  - memory keys using by API
  - motion_activate key using by API

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index 1055ace..9dba529 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -165,6 +165,9 @@ GOPTION="-g 6514"
        vconftool $GOPTION set -t string db/menu_widget/bgset "/opt/share/settings/Wallpapers/Home_default.jpg"
        vconftool $GOPTION set -t string db/idle_lock/bgset "/opt/share/settings/Wallpapers/Home_default.jpg"
 
        vconftool $GOPTION set -t string db/menu_widget/bgset "/opt/share/settings/Wallpapers/Home_default.jpg"
        vconftool $GOPTION set -t string db/idle_lock/bgset "/opt/share/settings/Wallpapers/Home_default.jpg"
 

+#resetMotions
+       vconftool $GOPTION set -t bool db/setting/motion_active "1"
+

 #resetDisplay
        #backlight
 # Set backlight timeout to dim display on all platforms except emulator
 #resetDisplay
        #backlight
 # Set backlight timeout to dim display on all platforms except emulator


@@ -191,11 +194,8 @@ GOPTION="-g 6514"
        vconftool $GOPTION set -t bool db/setting/pwrsv/system_mode/status "0"
        vconftool $GOPTION set -t bool db/setting/pwrsv/system_mode/reminder "1"
 
        vconftool $GOPTION set -t bool db/setting/pwrsv/system_mode/status "0"
        vconftool $GOPTION set -t bool db/setting/pwrsv/system_mode/reminder "1"
 

-       #v0.4
-        vconftool $GOPTION set -t bool db/setting/pwrsv/custom_mode/cpu "0"
-        vconftool $GOPTION set -t bool db/setting/pwrsv/custom_mode/screen_vib "0"
-

 #resetFont
 #resetFont

+       vconftool $GOPTION set -t int db/setting/font_size "1"

        vconftool $GOPTION set -t int db/setting/font_type "0"
 
 #resetRotationLock
        vconftool $GOPTION set -t int db/setting/font_type "0"
 
 #resetRotationLock


@@ -211,6 +211,7 @@ GOPTION="-g 6514"
 
        vconftool $GOPTION set -t int db/menu_widget/regionformat_time1224 "1"
        vconftool $GOPTION set -t int db/setting/date_format "0"
 
        vconftool $GOPTION set -t int db/menu_widget/regionformat_time1224 "1"
        vconftool $GOPTION set -t int db/setting/date_format "0"

+       vconftool $GOPTION set -t int db/setting/weekofday_format  "0"

 
        #-----------------------------------------------------------------
        # MOCK FUNCTION
 
        #-----------------------------------------------------------------
        # MOCK FUNCTION


@@ -233,9 +234,14 @@ GOPTION="-g 6514"
 
 
 #resetAccessibility
 
 
 #resetAccessibility

+       vconftool $GOPTION set -t bool db/setting/accessibility/accessibility "0"
+       vconftool $GOPTION set -t bool db/setting/accessibility/high_contrast "0"
+       vconftool $GOPTION set -t bool db/setting/accessibility/screen_zoom "1"

        vconftool $GOPTION set -t int db/setting/accessibility/font_size "1"
        #vconftool $GOPTION set -t int db/setting/accessibility/font_style "0"
        vconftool $GOPTION set -t string db/setting/accessibility/font_name "HelveticaNeue"
        vconftool $GOPTION set -t int db/setting/accessibility/font_size "1"
        #vconftool $GOPTION set -t int db/setting/accessibility/font_style "0"
        vconftool $GOPTION set -t string db/setting/accessibility/font_name "HelveticaNeue"

+       vconftool $GOPTION set -t bool db/setting/accessibility/tts "0"
+       vconftool $GOPTION set -t int db/setting/accessibility/speech_rate "2"

 
        #-----------------------------------------------------------------
        # MOCK FUNCTION
 
        #-----------------------------------------------------------------
        # MOCK FUNCTION


@@ -268,6 +274,7 @@ GOPTION="-g 6514"
        #vconftool $GOPTION set -t string db/setting/privacy_passwd ""
        vconftool $GOPTION set -t int db/setting/screen_lock_type "5" -f
        vconftool $GOPTION set -t string db/setting/3rd_lock_pkg_name "org.tizen.lockscreen"
        #vconftool $GOPTION set -t string db/setting/privacy_passwd ""
        vconftool $GOPTION set -t int db/setting/screen_lock_type "5" -f
        vconftool $GOPTION set -t string db/setting/3rd_lock_pkg_name "org.tizen.lockscreen"

+

        # NOT USED NOW.
        #vconftool $GOPTION set -t bool db/setting/rcs "0"
 
        # NOT USED NOW.
        #vconftool $GOPTION set -t bool db/setting/rcs "0"
 


@@ -276,6 +283,10 @@ GOPTION="-g 6514"
        vconftool $GOPTION set -t int db/setting/default_memory/bluetooth "0"
        vconftool $GOPTION set -t int db/setting/default_memory/camera "0"
        vconftool $GOPTION set -t int db/setting/default_memory/voice_recorder "0"
        vconftool $GOPTION set -t int db/setting/default_memory/bluetooth "0"
        vconftool $GOPTION set -t int db/setting/default_memory/camera "0"
        vconftool $GOPTION set -t int db/setting/default_memory/voice_recorder "0"

+       vconftool $GOPTION set -t int db/setting/default_memory/fm_radio "0"
+       vconftool $GOPTION set -t int db/setting/default_memory/all_share "0"
+       vconftool $GOPTION set -t int db/setting/default_memory/adobe_air "0"
+       vconftool $GOPTION set -t int db/setting/default_memory/dvb_h "0"

 
        # format - system server
        #vconftool $GOPTION -i set -t int memory/mmc/format "0"
 
        # format - system server
        #vconftool $GOPTION -i set -t int memory/mmc/format "0"

diff --git a/setting-common/src/setting-cfg.c b/setting-common/src/setting-cfg.c
index e51d364..981df07 100755 (executable)
--- a/setting-common/src/setting-cfg.c
+++ b/setting-common/src/setting-cfg.c
@@ -177,6 +177,7 @@ int setting_cfg_create(void)
 #if SUPPORT_CERTIFICATES
        __create_an_item(KeyStr_CertUI, IMG_MANAGE_APPS, "setting-manage-certificates-efl", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
 #endif
 #if SUPPORT_CERTIFICATES
        __create_an_item(KeyStr_CertUI, IMG_MANAGE_APPS, "setting-manage-certificates-efl", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
 #endif

+

        __create_an_item(KeyStr_Reset, IMG_Reset, "setting-reset-efl", Cfg_Item_Pos_Level1, Cfg_Item_unResetable);
        __create_an_item(KeyStr_DeveloperOption, IMG_USBconnection, "setting-developeroption-efl|viewtype:usb", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
        __create_an_item(KeyStr_AboutPhone, IMG_AboutPhone, "setting-about-efl", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
        __create_an_item(KeyStr_Reset, IMG_Reset, "setting-reset-efl", Cfg_Item_Pos_Level1, Cfg_Item_unResetable);
        __create_an_item(KeyStr_DeveloperOption, IMG_USBconnection, "setting-developeroption-efl|viewtype:usb", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);
        __create_an_item(KeyStr_AboutPhone, IMG_AboutPhone, "setting-about-efl", Cfg_Item_Pos_Level1, Cfg_Item_Resetable);