change 'header only' to normal & move from hotfix

change 'header only' to normal in vconf-internal-setting-keys.xml
- db/setting/homescreen_type
- db/setting/usb_connection_mode

move some keys from vconf-internal-hotfix.xml to vconf-internal-setting-keys.xml
- db/setting/prefer_arm_left
- db/setup_wizard/first_boot
- memory/setup_wizard/state

Change-Id: Ife2d264bb03f855d00c8d2d4d5f4140ca873ffaf
Signed-off-by: MyoungJune Park <mj2004.park@samsung.com>

diff --git a/data/vconf-internal-hotfix.xml b/data/vconf-internal-hotfix.xml
index dc044e0..d95dd81 100644 (file)
--- a/data/vconf-internal-hotfix.xml
+++ b/data/vconf-internal-hotfix.xml
@@ -15,38 +15,6 @@
     <email/>
     <comment><![CDATA[ it's for wearable project - org.tizen.clocksetting ]]></comment>
   </vconfkey>
-  <vconfkey type="int32" name="db/setup_wizard/first_boot" headeronly="true" readPriv="" writePriv="">
-    <header>VCONFKEY_SETUP_WIZARD_FIRST_BOOT</header>
-    <val>0</val>
-    <creator/>
-    <email/>
-    <comment><![CDATA[ ]]></comment>
-  </vconfkey>
-  <vconfkey type="int32" name="memory/setup_wizard/state" headeronly="true" readPriv="" writePriv="">
-    <header>VCONFKEY_SETUP_WIZARD_STATE</header>
-    <val>0</val>
-    <creator/>
-    <email/>
-    <comment><![CDATA[ org.tizen.whome refers to this key, bt-syspopup refers to VCONFKEY_SETUP_WIZARD_LOCK. ]]></comment>
-    <enumlist>
-      <enumdata value="0x00">VCONFKEY_SETUP_WIZARD_UNLOCK</enumdata>
-      <enumdata>VCONFKEY_SETUP_WIZARD_LOCK  </enumdata>
-    </enumlist>
-  </vconfkey>
-  <vconfkey type="int32" name="db/ode/crypto_state" headeronly="true" readPriv="" writePriv="">
-    <header>VCONFKEY_ODE_CRYPTO_STATE</header>
-    <val>0</val>
-    <creator/>
-    <email/>
-    <comment><![CDATA[ callmgr-util, org.tizen.call-ui and starter-0.5.52 refers to this key. but Removing is required. ]]></comment>
-  </vconfkey>
-  <vconfkey type="int32" name="db/sde/crypto_state" headeronly="true" readPriv="" writePriv="">
-    <header>VCONFKEY_SDE_CRYPTO_STATE</header>
-    <val>0</val>
-    <creator/>
-    <email/>
-    <comment><![CDATA[ ]]></comment>
-  </vconfkey>
   <vconfkey type="int32" name="db/ciss/answering_mode" headeronly="true" readPriv="" writePriv="">
     <header>VCONFKEY_CISSAPPL_ANSWERING_MODE_INT</header>
     <val>0</val>
@@ -75,13 +43,6 @@
     <email/>
     <comment><![CDATA[ ]]></comment>
   </vconfkey>
-  <vconfkey type="int32" name="db/setting/prefer_arm_left" headeronly="true" readPriv="http://tizen.org/privilege/internal/default/public" writePriv="http://tizen.org/privilege/internal/default/platform">
-    <header>VCONFKEY_SETAPPL_PERFERED_ARM_LEFT_BOOL</header>
-    <val>0</val>
-    <creator/>
-    <email/>
-    <comment><![CDATA[ b2clocksetting use this key for setting-sound ]]></comment>
-  </vconfkey>
   <vconfkey type="int32" name="db/setting/colorblind/status" headeronly="true" readPriv="" writePriv="">
     <header>VCONFKEY_SETAPPL_COLORBLIND_STATUS_BOOL</header>
     <val>0</val>

diff --git a/data/vconf-internal-setting-keys.xml b/data/vconf-internal-setting-keys.xml
index 73aba0e..0999061 100644 (file)
--- a/data/vconf-internal-setting-keys.xml
+++ b/data/vconf-internal-setting-keys.xml
@@ -302,7 +302,7 @@ echo "--------------------------------------------------------------------------
     <email>mj2004.park@samsung.com</email>
     <comment><![CDATA[ ]]></comment>
   </vconfkey>
-  <vconfkey type="int32" name="db/setting/usb_connection_mode" headeronly="true" readPriv="" writePriv="">
+  <vconfkey type="int32" name="db/setting/usb_connection_mode" readPriv="http://tizen.org/privilege/internal/default/public" writePriv="http://tizen.org/privilege/internal/default/platform">
     <header>VCONFKEY_SETAPPL_USB_CONNECTION_MODE_INT</header>
     <val>0</val>
     <creator> Myoungjune Park </creator>
@@ -1217,7 +1217,7 @@ echo "Do Nothing on TV"
     <email>mj2004.park@samsung.com</email>
     <comment><![CDATA[ ]]></comment>
   </vconfkey>
-  <vconfkey type="int32" name="db/setting/homescreen_type" headeronly="true" readPriv="http://tizen.org/privilege/internal/default/public" writePriv="http://tizen.org/privilege/internal/default/platform">
+  <vconfkey type="int32" name="db/setting/homescreen_type" readPriv="http://tizen.org/privilege/internal/default/public" writePriv="http://tizen.org/privilege/internal/default/platform">
     <header>VCONFKEY_SETAPPL_HOMESCREEN_TYPE_INT</header>
     <val>0</val>
     <creator> Myoungjune Park </creator>
@@ -1579,4 +1579,29 @@ echo "Do Nothing on TV"
     <email>mj2004.park@samsung.com</email>
     <comment><![CDATA[initialized value : set from adid UI app/first boot value from setup wizard app.]]></comment>
   </vconfkey>
+  <vconfkey type="int32" name="db/setting/prefer_arm_left" headeronly="true" readPriv="http://tizen.org/privilege/internal/default/public" writePriv="http://tizen.org/privilege/internal/default/platform">
+    <header>VCONFKEY_SETAPPL_PERFERED_ARM_LEFT_BOOL</header>
+    <val>0</val>
+    <creator/>
+    <email/>
+    <comment><![CDATA[ b2clocksetting use this key for setting-sound ]]></comment>
+  </vconfkey>
+  <vconfkey type="int32" name="db/setup_wizard/first_boot" headeronly="true" readPriv="" writePriv="">
+    <header>VCONFKEY_SETUP_WIZARD_FIRST_BOOT</header>
+    <val>0</val>
+    <creator/>
+    <email/>
+    <comment><![CDATA[ ]]></comment>
+  </vconfkey>
+  <vconfkey type="int32" name="memory/setup_wizard/state" headeronly="true" readPriv="" writePriv="">
+    <header>VCONFKEY_SETUP_WIZARD_STATE</header>
+    <val>0</val>
+    <creator/>
+    <email/>
+    <comment><![CDATA[ org.tizen.whome refers to this key, bt-syspopup refers to VCONFKEY_SETUP_WIZARD_LOCK. ]]></comment>
+    <enumlist>
+      <enumdata value="0x00">VCONFKEY_SETUP_WIZARD_UNLOCK</enumdata>
+      <enumdata>VCONFKEY_SETUP_WIZARD_LOCK  </enumdata>
+    </enumlist>
+  </vconfkey>
 </vconfkeylists>