From: Youngjae Shin <yj99.shin@samsung.com>
Date: Tue, 29 Oct 2019 10:20:28 +0000 (+0900)
Subject: code clean up and revise examples
X-Git-Tag: submit/tizen/20200406.072014~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8fa04603520d548d251ffdd758c231e8dbaebe0a;p=platform%2Fcore%2Fsystem%2Fmodes-plugins.git

code clean up and revise examples
---

diff --git a/unittests/mode/tizen_powerSave_mode.xml b/unittests/mode/tizen_powerSave_mode.xml
index 5ece2f8..5294c37 100644
--- a/unittests/mode/tizen_powerSave_mode.xml
+++ b/unittests/mode/tizen_powerSave_mode.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tizenModes xmlns="http://www.tizen.org" version="6.0">
-  <mode name="powerSave" type="exclusive">
-    <action rule="vconf.db.setting.psmode">SETTING_PSMODE_WEARABLE_ENHANCED</action>
-    <action rule="vconf.db.bluetooth.status">VCONFKEY_BT_STATUS_OFF</action>
+  <mode name="Power-Save" type="exclusive">
+    <action rule="wifi.power">off</action>
+    <action rule="bluetooth.power">off</action>
+    <action rule="pkg.startSupportMode">ULTRA_POWER_SAVING</action>
+    <action rule="display.brightness">30</action>
+    <action rule="vconf.db.setting.sound.sound_on">0</action>
+    <action rule="vconf.db.setting.sound.vibration_on">0</action>
+    <action rule="vconf.db.location.setting.Usemylocation">0</action>
   </mode>
 </tizenModes>
diff --git a/unittests/mode/tizen_quickpanel_mode.xml b/unittests/mode/tizen_quickpanel_mode.xml
new file mode 100644
index 0000000..0f1c396
--- /dev/null
+++ b/unittests/mode/tizen_quickpanel_mode.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tizenModes xmlns="http://www.tizen.org" version="6.0">
+  <mode name="Quick-Panel" type="normal">
+    <action rule="vconf.db.setting.sound.sound_on">1</action>
+    <action rule="vconf.db.setting.sound.vibration_on">1</action>
+    <action rule="vconf.db.location.setting.Usemylocation">1</action>
+    <action rule="vconf.db.setting.auto_rotate_screen">1</action>
+    <action rule="vconf.db.bluetooth.status">VCONFKEY_BT_STATUS_ON</action>
+  </mode>
+</tizenModes>
diff --git a/unittests/mode/tizen_waterlock_mode.xml b/unittests/mode/tizen_waterlock_mode.xml
index f4bac82..b2da07c 100644
--- a/unittests/mode/tizen_waterlock_mode.xml
+++ b/unittests/mode/tizen_waterlock_mode.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tizenModes xmlns="http://www.tizen.org" version="6.0">
-  <mode name="waterlock" type="exclusive">
-    <action rule="bluetooth.power">off</action>
-    <action ID="wifiOff" rule="wifi.power" restrict="lock" priority="-100">off</action>
-    <action ID="1" rule="vconf.db.setting.psmode" restrict="lock" priority="-100">SETTING_PSMODE_WEARABLE_ENHANCED</action>
-    <undo ID="2" rule="vconf.db.setting.psmode" restrict="lock" priority="-100">SETTING_PSMODE_WEARABLE</undo>
-    <undo ID="3" rule="media.player">/opt/usr/data/settings/Alarms/Alarms_on_call.ogg</undo>
+  <mode name="Water-Lock" type="exclusive">
+    <action rule="vconf.db.setting.sound.sound_on">false</action>
+    <action rule="vconf.db.setting.sound.vibration_on">true</action>
+    <undo rule="media.player">/opt/usr/data/settings/Alarms/Alarms_on_call.ogg</undo>
   </mode>
 </tizenModes>
+
+
diff --git a/unittests/mode/tizen_wifiOn_mode.xml b/unittests/mode/tizen_wifiOn_mode.xml
index 0491aad..d2aad8d 100644
--- a/unittests/mode/tizen_wifiOn_mode.xml
+++ b/unittests/mode/tizen_wifiOn_mode.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <tizenModes xmlns="http://www.tizen.org" version="6.0">
-  <mode name="wifiOn" type="exclusive">
+  <mode name="wifi-on" type="normal">
     <action rule="wifi.power">on</action>
   </mode>
 </tizenModes>
diff --git a/vconf/tizen_vconf_rule.xml b/vconf/tizen_vconf_rule.xml
index 643ec8d..60fc32a 100644
--- a/vconf/tizen_vconf_rule.xml
+++ b/vconf/tizen_vconf_rule.xml
@@ -22,5 +22,21 @@
       <desc>test</desc>
       <domain>Network &amp; Connectivity</domain>
     </rule>
+    <rule name="vconf.db.setting.sound.sound_on" type="bool" since="6.0" plugin="vconf">
+      <desc>test</desc>
+      <domain>Multimedia</domain>
+    </rule>
+    <rule name="vconf.db.setting.sound.vibration_on" type="bool" since="6.0" plugin="vconf">
+      <desc>test</desc>
+      <domain>Multimedia</domain>
+    </rule>
+    <rule name="vconf.db.location.setting.Usemylocation" type="int" since="6.0" plugin="vconf">
+      <desc>test</desc>
+      <domain>Service Framework</domain>
+    </rule>
+    <rule name="vconf.db.setting.auto_rotate_screen" type="bool" since="6.0" plugin="vconf">
+      <desc>test</desc>
+      <domain>Graphics System</domain>
+    </rule>
   </actionRule>
 </tizenModes>
diff --git a/wifi/WifiActionPower.cpp b/wifi/WifiActionPower.cpp
index f728000..5a635c2 100644
--- a/wifi/WifiActionPower.cpp
+++ b/wifi/WifiActionPower.cpp
@@ -30,6 +30,7 @@ WifiActionPower::WifiActionPower()
 
 void WifiActionPower::activate_cb(wifi_manager_error_e result, void *user_data)
 {
+	INFO("wifi Activated");
 	if (WIFI_MANAGER_ERROR_NONE != result) {
 		const std::string &errStr = ((WifiActionPower*)user_data)->strErr(result);
 		ERR("activate_cb() Fail(%d, %s)", result, errStr.c_str());
@@ -38,6 +39,7 @@ void WifiActionPower::activate_cb(wifi_manager_error_e result, void *user_data)
 
 void WifiActionPower::deactivate_cb(wifi_manager_error_e result, void *user_data)
 {
+	INFO("wifi Deactivated");
 	if (WIFI_MANAGER_ERROR_NONE != result) {
 		const std::string &errStr = ((WifiActionPower*)user_data)->strErr(result);
 		ERR("deactivate_cb() Fail(%d, %s)", result, errStr.c_str());
@@ -63,7 +65,7 @@ int WifiActionPower::set(bool val)
 	} else {
 		int wifiRet = wifi_manager_deactivate(wifiManagerHandle, deactivate_cb, this);
 		if (WIFI_MANAGER_ERROR_NONE != wifiRet) {
-			ERR("wifi_manager_activate() Fail(%d, %s)", wifiRet, strErr(wifiRet).c_str());
+			ERR("wifi_manager_deactivate() Fail(%d, %s)", wifiRet, strErr(wifiRet).c_str());
 			return MODES_ERROR_SYSTEM;
 		}
 	}
@@ -102,7 +104,7 @@ int WifiActionPower::undo()
 	} else {
 		int wifiRet = wifi_manager_deactivate(wifiManagerHandle, deactivate_cb, this);
 		if (WIFI_MANAGER_ERROR_NONE != wifiRet) {
-			ERR("wifi_manager_activate() Fail(%d, %s)", wifiRet, strErr(wifiRet).c_str());
+			ERR("wifi_manager_deactivate() Fail(%d, %s)", wifiRet, strErr(wifiRet).c_str());
 			return MODES_ERROR_SYSTEM;
 		}
 	}