Fix for vconf keys and SwitchInteractionManager

This patch will:
1. Set default values of some vconf keys according to guideline
2. Copy std::string object when passed to callback inside SwitchInteractionManager

Change-Id: Ie510e84ed47df5ec82541418d9d3b513960fbe1f

diff --git a/src/SwitchInteractionManager.cpp b/src/SwitchInteractionManager.cpp
index a96e3c8..bc52205 100644 (file)
--- a/src/SwitchInteractionManager.cpp
+++ b/src/SwitchInteractionManager.cpp
@@ -66,7 +66,7 @@ void SwitchInteractionManager::registerAndGetStateAndValueVconfData(VConfInterfa
                VConfInterface::CallbackHandle &valueHandler, const std::string &valueKey, double &value)
 {
        stateHandler = Singleton<VConfInterface>::instance().registerAndGet<bool>(stateKey, false,
-       [&](auto state) {
+       [ &, valueKey = std::string(valueKey)](auto state) {
                if (state) {
                        valueHandler = Singleton<VConfInterface>::instance().registerAndGet<double>(valueKey, 0.0,
                        [&](auto x) {

diff --git a/utils/setVconfKeys.sh b/utils/setVconfKeys.sh
index 29e6727..9165917 100755 (executable)
--- a/utils/setVconfKeys.sh
+++ b/utils/setVconfKeys.sh
@@ -14,16 +14,16 @@ fi
 VCONF_PROJECT_PATH="db/setting/accessibility/universal-switch/"
 VCONF_PROJECT_PREFIX=${VCONF_KEY_PREFIX}${VCONF_PROJECT_PATH}
 
-$VCONFTOOL double "${VCONF_PROJECT_PREFIX}AUTO_MOVE_INT_VALUE" 0.0
+$VCONFTOOL double "${VCONF_PROJECT_PREFIX}AUTO_MOVE_INT_VALUE" 1.0
 $VCONFTOOL bool   "${VCONF_PROJECT_PREFIX}AUTO_MOVE_INT_ENABLED" 0
 
 $VCONFTOOL bool   "${VCONF_PROJECT_PREFIX}AUTO_SCAN_ENABLED" 1
-$VCONFTOOL double "${VCONF_PROJECT_PREFIX}AUTO_SCAN_INTERVAL" 1.0                      #time between jumps in row scanning
+$VCONFTOOL double "${VCONF_PROJECT_PREFIX}AUTO_SCAN_INTERVAL" 2.0                      #time between jumps in row scanning
 
 $VCONFTOOL bool "${VCONF_PROJECT_PREFIX}AUTO_SCROLL_ENABLED" 0
 
 $VCONFTOOL bool   "${VCONF_PROJECT_PREFIX}AUTO_TAP_ENABLED" 0
-$VCONFTOOL double "${VCONF_PROJECT_PREFIX}AUTO_TAP_WAITING_TIME" 0.0
+$VCONFTOOL double "${VCONF_PROJECT_PREFIX}AUTO_TAP_WAITING_TIME" 1.0
 
 $VCONFTOOL bool   "${VCONF_PROJECT_PREFIX}AUTO_TAP_KBD_ENABLED" 0
 
@@ -40,15 +40,15 @@ $VCONFTOOL int "${VCONF_PROJECT_PREFIX}GRANULARITY_UNIT" 1                                  # 1 = CHARACTER,
 
 $VCONFTOOL int "${VCONF_PROJECT_PREFIX}LOOP_LIMIT_TO_INACTION" 5                               # how many runs before scanning abort
 
-$VCONFTOOL bool   "${VCONF_PROJECT_PREFIX}PAUSE_ON_FIRST_ELEMENT_ENABLED" 1    # extended time for first object in row scanning [s/10]
+$VCONFTOOL bool   "${VCONF_PROJECT_PREFIX}PAUSE_ON_FIRST_ELEMENT_ENABLED" 0    # extended time for first object in row scanning [s/10]
 $VCONFTOOL double "${VCONF_PROJECT_PREFIX}PAUSE_ON_FIRST_ELEMENT_TIME" 1.0
 
 $VCONFTOOL int "${VCONF_PROJECT_PREFIX}SCAN_DIRECTION_VERTICAL" 1                      # 1 = SD_TOP_BOTTOM, 2 = SD_BOTTOM_TOP
 $VCONFTOOL int "${VCONF_PROJECT_PREFIX}SCAN_DIRECTION_HORIZONTAL" 1                    # 1 = SD_LEFT_RIGHT, 2 = SD_RIGHT_LEFT
 $VCONFTOOL int "${VCONF_PROJECT_PREFIX}SCAN_METHOD" 2                                          # 1 = POINT, 2 = ROW
-$VCONFTOOL int "${VCONF_PROJECT_PREFIX}SCAN_PT_SPEED" 30                                       # speed for PointScanner, jump time for RowScanner
+$VCONFTOOL int "${VCONF_PROJECT_PREFIX}SCAN_PT_SPEED" 10                                       # speed for PointScanner, jump time for RowScanner
 
-$VCONFTOOL double "${VCONF_PROJECT_PREFIX}SGL_INACTION_INT_VALUE" 0.0
+$VCONFTOOL double "${VCONF_PROJECT_PREFIX}SGL_INACTION_INT_VALUE" 0.5
 $VCONFTOOL bool   "${VCONF_PROJECT_PREFIX}SGL_INACTION_INT_ENABLED" 0
 
 $VCONFTOOL bool "${VCONF_PROJECT_PREFIX}SHOW_ACTIONS_MENU_ITEM" 1
@@ -60,12 +60,10 @@ $VCONFTOOL bool "${VCONF_PROJECT_PREFIX}SHOW_HOME_SCREEN_MENU_ITEM" 1
 $VCONFTOOL bool "${VCONF_PROJECT_PREFIX}SHOW_RECENT_APPS_MENU_ITEM" 1
 $VCONFTOOL bool "${VCONF_PROJECT_PREFIX}SHOW_SETTINGS_MENU_ITEM" 1
 
-$VCONFTOOL double "${VCONF_PROJECT_PREFIX}TAP_DURATION_VALUE" 0.0
+$VCONFTOOL double "${VCONF_PROJECT_PREFIX}TAP_DURATION_VALUE" 0.5
 $VCONFTOOL bool   "${VCONF_PROJECT_PREFIX}TAP_DURATION_ENABLED" 0
 
 $VCONFTOOL int "${VCONF_PROJECT_PREFIX}TEXT_EDITION_MODE" 1
 
 $VCONFTOOL bool "${VCONF_PROJECT_PREFIX}configuration-service" 0
 $VCONFTOOL bool "${VCONF_PROJECT_PREFIX}interaction-service" 0
-
-