Inherit mainpage from MenuGadget instead of MainMenuGadget

Change-Id: Ia6dc9275ebc71dd04bb273524644173745f501e0
Signed-off-by: Akash Kumar <akash1.kumar@samsung.com>

diff --git a/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.cs b/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.cs
index d1bbc3692c88678462a6fdca6d82790988c4a369..ab2ae1a7c66937fa1f6c1c6340b040f740c77329 100644 (file)
--- a/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.cs
+++ b/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.cs
@@ -12,12 +12,10 @@ using static SettingWiFiDirect.Logger;
 
 namespace SettingWiFiDirect
 {
-    public class MainPage : SettingCore.MainMenuGadget
+    public class MainPage : SettingCore.MenuGadget
     {
         private WiFiDirect mWifiDirect;
         private PeerSource mPeerSource;
-        public override string ProvideIconPath() => GetResourcePath("main-menu-wifi-icon.svg");
-        public override Color ProvideIconColor() => new Color(ThemeManager.PlatformThemeId == "org.tizen.default-light-theme" ? "#FF6200" : "#FF8A00");
         public override string ProvideTitle() => Resources.IDS_WIFI_BODY_WI_FI_DIRECT_ABB;
 
         protected override void OnCustomizationUpdate(IEnumerable<MenuCustomizationItem> items)

diff --git a/SettingWiFiDirect/SettingWiFiDirect/controller/WiFiDirect.cs b/SettingWiFiDirect/SettingWiFiDirect/controller/WiFiDirect.cs
index eca65354a2c319e44700917827ad665eee423057..cdc525c306ac8f84fa34afb9c270d3542742ede9 100644 (file)
--- a/SettingWiFiDirect/SettingWiFiDirect/controller/WiFiDirect.cs
+++ b/SettingWiFiDirect/SettingWiFiDirect/controller/WiFiDirect.cs
@@ -47,7 +47,7 @@ namespace SettingWiFiDirect
             }
             catch (Exception e)
             {
-                Debug("Fail to activate WiFi " + e.ToString());
+                Debug("Fail to activate WiFi Direct " + e.ToString());
             }
         }
 

diff --git a/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml b/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml
index 4cddbaed2b1ed3072e74b9c45ecba2bc90528b86..653febae61279d244ff7061eff0977496e6d9645 100644 (file)
--- a/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml
+++ b/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="7.0"
-  package="org.tizen.cssetting-wifi-direct" version="1.0.1"
+  package="org.tizen.cssetting-wifi-direct" version="1.0.2"
   res-type="org.tizen.appfw.gadget.setting-wifi-direct" res-version="1.0.0">
        <allowed-package id="org.tizen.*">
                <required-privileges>
+                       <privilege>http://tizen.org/privilege/wifidirect</privilege>
                        <privilege>http://tizen.org/privilege/network.get</privilege>
                        <privilege>http://tizen.org/privilege/network.set</privilege>
                        <privilege>http://tizen.org/privilege/network.profile</privilege>

diff --git a/packaging/org.tizen.cssetting-wifi-direct-1.0.1.rpk b/packaging/org.tizen.cssetting-wifi-direct-1.0.1.rpk
deleted file mode 100644 (file)
index f4a245a..0000000
Binary files a/packaging/org.tizen.cssetting-wifi-direct-1.0.1.rpk and /dev/null differ

diff --git a/packaging/org.tizen.cssetting-wifi-direct-1.0.2.rpk b/packaging/org.tizen.cssetting-wifi-direct-1.0.2.rpk
new file mode 100644 (file)
index 0000000..0a7d0fc
Binary files /dev/null and b/packaging/org.tizen.cssetting-wifi-direct-1.0.2.rpk differ

diff --git a/packaging/org.tizen.setting-wifi-direct.spec b/packaging/org.tizen.setting-wifi-direct.spec
index e0973b4d4993907a912bb25368132f2f533295d3..a63a03c88576334cac3fd0e5510b26a8bec8d496 100644 (file)
--- a/packaging/org.tizen.setting-wifi-direct.spec
+++ b/packaging/org.tizen.setting-wifi-direct.spec
@@ -1,6 +1,6 @@
 Name:          org.tizen.setting-wifi-direct
 summary:       NUI wifi-direct setting application
-Version:       1.0.1
+Version:       1.0.2
 Release:       1
 Provides:      org.tizen.setting-wifi-direct = %{version}-%{release}
 Group:         Applications/Security