Redefine universal-switch vconf keys.

Change-Id: I482ad3e3b422c1586dc80138a4bab424ea6b6814

diff --git a/src/UniversalSwitch.cpp b/src/UniversalSwitch.cpp
index 1678163..0deb3eb 100644 (file)
--- a/src/UniversalSwitch.cpp
+++ b/src/UniversalSwitch.cpp
@@ -67,7 +67,7 @@ bool UniversalSwitch::initialize(const std::array<Optional<std::string>, (size_t
        PRINT_ERROR_IF(!device_display_get_state(&displayState));
        isDisplayOn = (displayState == DISPLAY_STATE_NORMAL);
 
-       callbackHandle = Singleton<VConfInterface>::instance().registerAndGet<bool>(VCONF_KEY_SCANNING, false,
+       callbackHandle = Singleton<VConfInterface>::instance().registerAndGet<bool>(VCONF_KEY_INTERACTION_SERVICE, false,
        [this](auto enabled) {
                this->isScanningOn = enabled;
                this->updateMode();

diff --git a/src/VConfKeys.hpp b/src/VConfKeys.hpp
index 0524e71..36b28bd 100644 (file)
--- a/src/VConfKeys.hpp
+++ b/src/VConfKeys.hpp
@@ -20,6 +20,7 @@
 #define VCONF_PROJECT_PATH             "db/setting/accessibility/universal-switch/"
 #define VCONF_PROJECT_PREFIX   VCONF_PROJECT_PATH
 
+#define VCONF_KEY_INTERACTION_SERVICE                          VCONF_PROJECT_PREFIX "interaction-service"
 
 #define VCONF_KEY_AUTO_MOVE_INT_VALUE                          VCONF_PROJECT_PREFIX "AUTO_MOVE_INT_VALUE"
 #define VCONF_KEY_AUTO_MOVE_INT_ENABLED                                VCONF_PROJECT_PREFIX "AUTO_MOVE_INT_ENABLED"
@@ -54,7 +55,6 @@
 #define VCONF_KEY_PAUSE_ON_FIRST_ELEMENT_ENABLED       VCONF_PROJECT_PREFIX "PAUSE_ON_FIRST_ELEMENT_ENABLED"
 #define VCONF_KEY_PAUSE_ON_FIRST_ELEMENT_TIME          VCONF_PROJECT_PREFIX "PAUSE_ON_FIRST_ELEMENT_TIME"
 
-#define VCONF_KEY_SCANNING                                                     VCONF_PROJECT_PREFIX "scanning"
 #define VCONF_KEY_SCAN_DIRECTION_HORIZONTAL                    VCONF_PROJECT_PREFIX "SCAN_DIRECTION_HORIZONTAL"
 #define VCONF_KEY_SCAN_DIRECTION_VERTICAL                      VCONF_PROJECT_PREFIX "SCAN_DIRECTION_VERTICAL"
 #define VCONF_KEY_SCAN_METHOD                                          VCONF_PROJECT_PREFIX "SCAN_METHOD"

diff --git a/utils/setVconfKeys.sh b/utils/setVconfKeys.sh
index 3fa0697..29e6727 100755 (executable)
--- a/utils/setVconfKeys.sh
+++ b/utils/setVconfKeys.sh
@@ -14,10 +14,6 @@ fi
 VCONF_PROJECT_PATH="db/setting/accessibility/universal-switch/"
 VCONF_PROJECT_PREFIX=${VCONF_KEY_PREFIX}${VCONF_PROJECT_PATH}
 
-# TODO this prefix should be removed, that action requires change of accessibility/universal-switch key (also in settings repository)
-# into accessibility/universal-switch/enabled
-VCONF_ACCESSIBILITY_PREFIX=${VCONF_KEY_PREFIX}"db/setting/accessibility/"
-
 $VCONFTOOL double "${VCONF_PROJECT_PREFIX}AUTO_MOVE_INT_VALUE" 0.0
 $VCONFTOOL bool   "${VCONF_PROJECT_PREFIX}AUTO_MOVE_INT_ENABLED" 0
 
@@ -47,7 +43,6 @@ $VCONFTOOL int "${VCONF_PROJECT_PREFIX}LOOP_LIMIT_TO_INACTION" 5                              # how many r
 $VCONFTOOL bool   "${VCONF_PROJECT_PREFIX}PAUSE_ON_FIRST_ELEMENT_ENABLED" 1    # extended time for first object in row scanning [s/10]
 $VCONFTOOL double "${VCONF_PROJECT_PREFIX}PAUSE_ON_FIRST_ELEMENT_TIME" 1.0
 
-$VCONFTOOL bool "${VCONF_PROJECT_PREFIX}scanning" 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
@@ -68,6 +63,9 @@ $VCONFTOOL bool "${VCONF_PROJECT_PREFIX}SHOW_SETTINGS_MENU_ITEM" 1
 $VCONFTOOL double "${VCONF_PROJECT_PREFIX}TAP_DURATION_VALUE" 0.0
 $VCONFTOOL bool   "${VCONF_PROJECT_PREFIX}TAP_DURATION_ENABLED" 0
 
-$VCONFTOOL bool "${VCONF_ACCESSIBILITY_PREFIX}universal-switch"   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
+
+