Fix appid conflict

Fin appid conflict and error of icon assignment in org.tizen.setting.xml

Change-Id: I8ff607fb7ebe0147000a0052c334e4333c66e976
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

diff --git a/org.tizen.setting.xml b/org.tizen.setting.xml
index 0293978250d682d844797a2e0a9a430d2975b7cd..091f951d01e68566ce4fcbbf999c666a67de899e 100755 (executable)
--- a/org.tizen.setting.xml
+++ b/org.tizen.setting.xml
@@ -119,7 +119,7 @@
         </ui-application>
 
        <ui-application appid="setting-storage-efl" exec="/usr/apps/org.tizen.setting/bin/setting-storage-efl" type="capp" nodisplay="true" taskmanage="false" ui-gadget="true">
-                        <icon>/usr/apps/org.tizen.setting/res/icons/settings_storage.png</icon>
+                        <icon>/usr/share/icons/default/small/org.tizen.setting.png</icon>
                         <label>Storage</label>
                         <label xml:lang="en-us">Storage</label>
                        <label xml:lang="ja-jp">ストレージ</label>
@@ -176,19 +176,6 @@
         <ui-application appid="org.tizen.setting-blockingmode-alarm" exec="/usr/apps/org.tizen.setting/bin/setting-blockingmode-alarm" type="capp" nodisplay="true" taskmanage="false" ui-gadget="true">
                        <label>Setting-blockingmode-alarm</label>
        </ui-application>
-       <ui-application appid="setting-privacy-efl" exec="/usr/apps/org.tizen.setting/bin/setting-privacy-efl" type="capp" nodisplay="true" taskmanage="false" ui-gadget="true">
-                       <icon>/usr/share/icons/default/small/org.tizen.setting.png</icon>
-                       <label>Privacy </label>
-                       <label xml:lang="en-us">Privacy</label>
-                       <label xml:lang="ja-jp">プライバシー</label>
-                       <label xml:lang="ko-kr">개인 정보 보호</label>
-                       <application-service>
-                               <operation name="http://samsung.com/appcontrol/operation/configure/privacy"/>
-                       </application-service>
-                       <application-service>
-                               <operation name="http://tizen.org/appcontrol/operation/configure/privacy"/>
-                       </application-service>
-       </ui-application>
        <ui-application appid="setting-motion-efl" exec="/usr/apps/org.tizen.setting/bin/setting-motion-efl" type="capp" nodisplay="true" taskmanage="false" ui-gadget="true">
                        <icon>/usr/share/icons/default/small/org.tizen.setting.png</icon>
                        <label>Motion</label>