Change Rename Device from Widget to ContentPage

- call RemoveWidget() when widgetview is popped
- add silent in notification sound
- change string of bluetooth address

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

diff --git a/SettingMain/SettingContent_Base.cs b/SettingMain/SettingContent_Base.cs
index 6706d833c8b1a110ad75670fa51f908b92af4dbd..0070631297f6342be4de6de110f805418fe9ad83 100644 (file)
--- a/SettingMain/SettingContent_Base.cs
+++ b/SettingMain/SettingContent_Base.cs
@@ -88,21 +88,22 @@ namespace SettingMain
 \r
         protected string mTitle;\r
         protected ContentPage mPage;\r
+        Bundle mBundle;\r
 \r
         public SettingContent_Base()\r
             : base()\r
         {\r
             mWindow = null;\r
             mPage = null;\r
+            mBundle = null;\r
         }\r
 \r
         protected override void OnCreate(string contentInfo, Window window)\r
         {\r
-            Bundle bundle = Bundle.Decode(contentInfo);\r
-\r
-            window.BackgroundColor = Color.Transparent;\r
+            mBundle = Bundle.Decode(contentInfo);\r
 \r
             mWindow = window;\r
+            mWindow.BackgroundColor = Color.Transparent;\r
 \r
             mPage = new ContentPage()\r
             {\r

diff --git a/SettingMain/SettingContent_DeviceStatus.cs b/SettingMain/SettingContent_DeviceStatus.cs
index 557387526485a700f908a904d2d3740e21ce6a6a..e8cbd8c71e532e799c60b61e1ef4de2ebff962da 100644 (file)
--- a/SettingMain/SettingContent_DeviceStatus.cs
+++ b/SettingMain/SettingContent_DeviceStatus.cs
@@ -79,12 +79,29 @@ namespace SettingMain
 \r
 \r
 #if true\r
-            item = SettingItemCreator.CreateItemWithCheck(Resources.IDS_ST_MBODY_BLUETOOTH_ADDRESS, Tizen.Network.Bluetooth.BluetoothAdapter.Address);\r
+            string addressBT = Resources.IDS_ST_HEADER_UNAVAILABLE;\r
+            try\r
+            {\r
+                if (Tizen.Network.Bluetooth.BluetoothAdapter.IsBluetoothEnabled)\r
+                    addressBT = Tizen.Network.Bluetooth.BluetoothAdapter.Address;\r
+                else\r
+                    addressBT = Resources.IDS_ST_SBODY_DISABLED;\r
+            }\r
+            catch (Exception e) {\r
+            }\r
+\r
+            item = SettingItemCreator.CreateItemWithCheck(Resources.IDS_ST_MBODY_BLUETOOTH_ADDRESS, addressBT);\r
             content.Add(item);\r
 #endif\r
 \r
 #if true\r
-            item = SettingItemCreator.CreateItemWithCheck(Resources.IDS_ST_BODY_WI_FI_MAC_ADDRESS, Tizen.Network.WiFi.WiFiManager.MacAddress);\r
+            string addressMac = Resources.IDS_ST_HEADER_UNAVAILABLE;\r
+            if (Tizen.Network.WiFi.WiFiManager.IsActive)\r
+                addressMac = Tizen.Network.WiFi.WiFiManager.MacAddress;\r
+            else\r
+                addressMac = Resources.IDS_ST_SBODY_DISABLED;\r
+\r
+            item = SettingItemCreator.CreateItemWithCheck(Resources.IDS_ST_BODY_WI_FI_MAC_ADDRESS, addressMac);\r
             content.Add(item);\r
 #endif\r
             IEnumerator<Storage> storages = StorageManager.Storages.GetEnumerator();\r
@@ -100,12 +117,12 @@ namespace SettingMain
             content.Add(item);\r
 \r
 \r
-\r
+#if false\r
             // To do : Caluacate CPU Usage\r
             // Tizen.System.ProcessCpuUsage\r
             item = SettingItemCreator.CreateItemWithCheck(Resources.IDS_ST_BODY_CPU_USAGE, Resources.IDS_ST_HEADER_UNAVAILABLE);\r
             content.Add(item);\r
-\r
+#endif\r
             return content;\r
         }\r
     }\r

diff --git a/SettingMain/SettingContent_Display.cs b/SettingMain/SettingContent_Display.cs
index 90e07dce37e84ea74f7c678f9253586dadf1dd9f..3ce1589788e7b269821a6987ac4b03dddc180a36 100644 (file)
--- a/SettingMain/SettingContent_Display.cs
+++ b/SettingMain/SettingContent_Display.cs
@@ -88,8 +88,16 @@ namespace SettingMain
 \r
             if (Display.NumberOfDisplays > 0)\r
             {\r
+                int brightness = 0;\r
+                try\r
+                {\r
+                    brightness = Display.Displays[0].Brightness;\r
+                }\r
+                catch (Exception e)\r
+                {\r
+                    Tizen.Log.Debug("NUI", string.Format("error :({0}) {1} ", e.GetType().ToString(), e.Message));\r
+                }\r
 \r
-                int brightness = Display.Displays[0].Brightness;\r
                 int maxbrightness = Display.Displays[0].MaxBrightness;\r
 \r
                 GetBrightnessSliderIcon(brightness, out string iconpath);\r
@@ -217,7 +225,14 @@ namespace SettingMain
                 mBrightnessItem.mIcon.SetImage(iconpath);\r
            }\r
 \r
-            Display.Displays[0].Brightness = brightness;\r
+            try\r
+            {\r
+                Display.Displays[0].Brightness = brightness;\r
+            }\r
+            catch (Exception e)\r
+            {\r
+                Tizen.Log.Debug("NUI", string.Format("error :({0}) {1} ", e.GetType().ToString(), e.Message));\r
+            }\r
         }\r
 \r
     }\r

diff --git a/SettingMain/SettingContent_LanguageInput.cs b/SettingMain/SettingContent_LanguageInput.cs
index 1590c3de284aba4d8a73023136df6cab5da515f8..7865bc188def552d6f7432373f74101255129de8 100644 (file)
--- a/SettingMain/SettingContent_LanguageInput.cs
+++ b/SettingMain/SettingContent_LanguageInput.cs
@@ -61,6 +61,8 @@ namespace SettingMain
                 content.Add(item);\r
             }\r
 \r
+            content.Add(SettingItemCreator.CreateItemStatic(""));\r
+            content.Add(SettingItemCreator.CreateItemStatic(Resources.IDS_ST_BODY_KEYBOARD));\r
 \r
             item = SettingItemCreator.CreateItemWithCheck(Resources.IDS_ST_BODY_KEYBOARD);\r
             if (item != null)\r
@@ -72,6 +74,8 @@ namespace SettingMain
                 content.Add(item);\r
             }\r
 \r
+            content.Add(SettingItemCreator.CreateItemStatic(""));\r
+            content.Add(SettingItemCreator.CreateItemStatic(Resources.IDS_ST_BODY_INPUT_ASSISTANCE));\r
 \r
             item = SettingItemCreator.CreateItemWithCheck(Resources.IDS_ST_BODY_AUTOFILL_SERVICE);\r
             if (item != null)\r
@@ -83,8 +87,9 @@ namespace SettingMain
                 content.Add(item);\r
             }\r
 \r
-\r
-\r
+            content.Add(SettingItemCreator.CreateItemStatic(""));\r
+            content.Add(SettingItemCreator.CreateItemStatic(Resources.IDS_ST_BODY_SPEECH));\r
+            \r
             item = SettingItemCreator.CreateItemWithCheck(Resources.IDS_VOICE_BODY_VOICE_CONTROL_ABB2);\r
             if (item != null)\r
             {\r

diff --git a/SettingMain/SettingContent_NotificationSound.cs b/SettingMain/SettingContent_NotificationSound.cs
index aafad56ad31931fef1fdfd820a0b5df125b277aa..9fb94cd3cd8fcae2224be61fb922f2e063451361 100644 (file)
--- a/SettingMain/SettingContent_NotificationSound.cs
+++ b/SettingMain/SettingContent_NotificationSound.cs
@@ -23,23 +23,46 @@ using Tizen.NUI.Components;
 using Tizen.Applications;\r
 using System.Collections.ObjectModel;\r
 using Tizen.System;\r
+using Tizen.Multimedia;\r
 \r
 using SettingAppTextResopurces.TextResources;\r
 \r
 namespace SettingMain\r
 {\r
 \r
-    \r
-\r
     class SettingContent_NotificationSound : SettingContent_Base\r
     {\r
+        public const string keyNotificationSound = "db/setting/sound/noti/msg_ringtone_path";\r
 \r
-        static public string GetFileName(string value)\r
+        public static string SettingMediaBasename(string path)\r
         {\r
-            String[] folders = value.Split('/');\r
+            if (string.IsNullOrEmpty(path))\r
+                return Resources.IDS_ST_BODY_PHONEPROFILES_SILENT;\r
+\r
+            string title = "";\r
+            try\r
+            {\r
+                var extractor = new Tizen.Multimedia.MetadataExtractor(path);\r
+                Metadata metadata = extractor.GetMetadata();\r
+                title = metadata.Title;\r
+            }\r
+            catch (Exception e){\r
+                Tizen.Log.Debug("NUI", string.Format("error :({0}) {1} ", e.GetType().ToString(), e.Message));\r
+            }\r
+\r
+            if (!string.IsNullOrEmpty(title))\r
+                return title;\r
+\r
+            return GetFileName(path);\r
+        }\r
+\r
+\r
+        private static string GetFileName(string path)\r
+        {\r
+            String[] folders = path.Split('/');\r
             int foldercount = folders.Length;\r
             if (foldercount > 0) return folders[foldercount - 1];\r
-            return value;\r
+            return path;\r
         }\r
 \r
 \r
@@ -51,6 +74,7 @@ namespace SettingMain
         {\r
             SoundList = new ArrayList();\r
 \r
+            SoundList.Add("");  // Silent\r
 \r
             string sharedData = "/opt/usr/data";\r
             string path = sharedData + "/settings/Alerts";\r
@@ -94,7 +118,7 @@ namespace SettingMain
             for (int i = 0; i < SoundList.Count; i++)\r
             {\r
                 string path = SoundList[i] as string;\r
-                PickerItems[i] = GetFileName(path);\r
+                PickerItems[i] = SettingMediaBasename(path);\r
             }\r
         }\r
 \r
@@ -138,7 +162,9 @@ namespace SettingMain
                 Layout = new LinearLayout()\r
                 {\r
                     HorizontalAlignment = HorizontalAlignment.Center,\r
+                    VerticalAlignment = VerticalAlignment.Center,\r
                     LinearOrientation = LinearLayout.Orientation.Vertical,\r
+                    \r
                 },\r
             };\r
             content.Add(new TextLabel(Resources.IDS_ST_BODY_NOTIFICATION));\r
@@ -173,20 +199,17 @@ namespace SettingMain
 \r
         private static void SetNotificationSound(string notificationsound)\r
         {\r
-            Vconf.SetString("db/setting/sound/noti/msg_ringtone_path", notificationsound);\r
+            Vconf.SetString(keyNotificationSound, notificationsound);\r
         }\r
 \r
         public static string GetNotificationSound()\r
         {\r
-            return Vconf.GetString("db/setting/sound/noti/msg_ringtone_path");\r
+            return Vconf.GetString(keyNotificationSound);\r
         }\r
         public static string GetNotificationSoundName()\r
         {\r
             string path = GetNotificationSound();\r
-            String[] folders = path.Split('/');\r
-            int foldercount = folders.Length;\r
-            if (foldercount > 0) return folders[foldercount - 1];\r
-            return path;\r
+            return SettingMediaBasename(path);\r
         }\r
     }\r
 }\r

diff --git a/SettingMain/SettingContent_Sound.cs b/SettingMain/SettingContent_Sound.cs
index f1d91526a465b2cb31be6f597fd84cc6133fb07b..710c418dc5d6f166e080123934ab0fc49bc2b482 100644 (file)
--- a/SettingMain/SettingContent_Sound.cs
+++ b/SettingMain/SettingContent_Sound.cs
@@ -31,8 +31,8 @@ namespace SettingMain
     class SettingContent_Sound : SettingContent_Base\r
     {\r
 \r
-        private DefaultLinearItem mSoundModeItem;\r
-        private DefaultLinearItem mNotificationSoundItem;\r
+        private static DefaultLinearItem mSoundModeItem;\r
+        private static DefaultLinearItem mNotificationSoundItem;\r
 \r
         public SettingContent_Sound()\r
             : base()\r
@@ -155,6 +155,8 @@ namespace SettingMain
 \r
 #if false\r
             Tizen.System.SystemSettings.SoundNotificationChanged += SystemSettings_NotificationSoundChanged;\r
+#else\r
+            Vconf.NotifyKeyChanged(SettingContent_NotificationSound.keyNotificationSound, VconfChanged_NotificationSound);\r
 #endif\r
         }\r
 \r
@@ -165,28 +167,36 @@ namespace SettingMain
 \r
 #if false\r
             Tizen.System.SystemSettings.SoundNotificationChanged -= SystemSettings_NotificationSoundChanged;\r
+#else\r
+            Vconf.IgnoreKeyChanged(SettingContent_NotificationSound.keyNotificationSound, VconfChanged_NotificationSound);\r
 #endif\r
             base.OnTerminate(contentInfo, type);\r
         }\r
 \r
-        private void SystemSettings_SoundSilentModeSettingChanged(object sender, SoundSilentModeSettingChangedEventArgs e)\r
+        private static void SystemSettings_SoundSilentModeSettingChanged(object sender, SoundSilentModeSettingChangedEventArgs e)\r
         {\r
             if (mSoundModeItem != null)\r
                 mSoundModeItem.SubText = SettingContent_Soundmode.GetSoundmodeName();\r
         }\r
-        private void SystemSettings_VibrationChanged(object sender, VibrationChangedEventArgs e)\r
+        private static void SystemSettings_VibrationChanged(object sender, VibrationChangedEventArgs e)\r
         {\r
             if (mSoundModeItem != null)\r
                 mSoundModeItem.SubText = SettingContent_Soundmode.GetSoundmodeName();\r
         }\r
 \r
-        private void SystemSettings_NotificationSoundChanged(object sender, SoundNotificationChangedEventArgs e)\r
+#if false\r
+        private static void SystemSettings_NotificationSoundChanged(object sender, SoundNotificationChangedEventArgs e)\r
         {\r
             if (mNotificationSoundItem != null)\r
                 mNotificationSoundItem.SubText = SettingContent_NotificationSound.GetNotificationSoundName();\r
         }\r
-\r
-\r
+#else\r
+        public static void VconfChanged_NotificationSound(IntPtr node, IntPtr userData)\r
+        {\r
+            if (mNotificationSoundItem != null)\r
+                mNotificationSoundItem.SubText = SettingContent_NotificationSound.GetNotificationSoundName();\r
+        }\r
+#endif\r
 \r
         /// ///////////////////////////\r
 \r

diff --git a/SettingMain/SettingItemCreator.cs b/SettingMain/SettingItemCreator.cs
index b9cf8dbcb28ff424c089f2c4307fb070365695f6..b6d8b27f8258cf88dedc886c28ed3663e1eb89a1 100644 (file)
--- a/SettingMain/SettingItemCreator.cs
+++ b/SettingMain/SettingItemCreator.cs
@@ -51,12 +51,12 @@ namespace SettingMain
                 {\r
                     LinearOrientation = LinearLayout.Orientation.Horizontal,\r
                     VerticalAlignment = VerticalAlignment.Center,\r
-                    CellPadding = new Size2D(10, 10)\r
-\r
                 },\r
+                WidthSpecification = LayoutParamPolicies.MatchParent,\r
                 Padding = new Extents(8, 0, 5, 5),\r
             };\r
 \r
+\r
             TextLabel label = new TextLabel(text)\r
             {\r
                 TextColor = Color.DarkGray\r

diff --git a/SettingView/SettingMenuManager.cs b/SettingView/SettingMenuManager.cs
index f9685cfdca704949e96780d0acc89b0048161c13..89e91ec326fefa4d786bc23ea6c43655801340a2 100644 (file)
--- a/SettingView/SettingMenuManager.cs
+++ b/SettingView/SettingMenuManager.cs
@@ -198,7 +198,32 @@ namespace SettingView
 \r
         public static void PopWidget(Window window)\r
         {\r
-            window.GetDefaultNavigator().Pop();\r
+            var page = window.GetDefaultNavigator().Pop();\r
+\r
+            ContentPage contentpage = page as ContentPage;\r
+            if (contentpage != null) {\r
+                var view = contentpage.Content;\r
+                WidgetView widgetview = view as WidgetView;\r
+                if (widgetview != null)\r
+                    WidgetViewManager.Instance.RemoveWidget(widgetview);\r
+                else\r
+                    Tizen.Log.Debug("NUI", "This View is Not a WidgetView");\r
+            }\r
+            else\r
+            {\r
+                DialogPage dialogpage = page as DialogPage;\r
+                if (dialogpage != null)\r
+                {\r
+                    var view = dialogpage.Content;\r
+                    WidgetView widgetview = view as WidgetView;\r
+                    if (widgetview != null)\r
+                        WidgetViewManager.Instance.RemoveWidget(widgetview);\r
+                    else\r
+                        Tizen.Log.Debug("NUI", "This View is Not a WidgetView");\r
+                }\r
+                else\r
+                    Tizen.Log.Debug("NUI", "This Page is Not a ContentPage or a DialogPage");\r
+            }\r
 \r
             LastestPushWidgetId = "";\r
         }\r
@@ -249,8 +274,16 @@ namespace SettingView
             {\r
                 if (widgetAction.Equals("PUSH"))\r
                 {\r
-                    Tizen.Log.Debug("NUI", "WIDGET_ACTION : PUSH!\n");\r
-                    PushWidget(NUIApplication.GetDefaultWindow(), widgetID);\r
+                    if (widgetID.Equals("renamedevice@org.tizen.cssettings"))\r
+                    {\r
+                        Tizen.Log.Debug("NUI", "WIDGET_ACTION : RENAMEDEVICE!\n");\r
+                        PushRenameContents(NUIApplication.GetDefaultWindow());\r
+                    }\r
+                    else\r
+                    {\r
+                        Tizen.Log.Debug("NUI", "WIDGET_ACTION : PUSH!\n");\r
+                        PushWidget(NUIApplication.GetDefaultWindow(), widgetID);\r
+                    }\r
                 }\r
                 else if (widgetAction.Equals("POP"))\r
                 {\r
@@ -309,8 +342,6 @@ namespace SettingView
         }\r
 \r
 \r
-#if true\r
-\r
         public static SettingMenuInfo[] ReadMenuList(string folderpath, string name)\r
         {\r
             string locale = Vconf.GetString("db/menu_widget/language");\r
@@ -344,7 +375,24 @@ namespace SettingView
 \r
             return menulist;\r
         }\r
-#endif\r
+\r
+        private static void PushRenameContents(Window window)\r
+        {\r
+            Navigator navigator = window.GetDefaultNavigator();\r
+\r
+            ContentPage renamepage = new SettingRenameDevicePage(window) {\r
+                WidthSpecification = LayoutParamPolicies.MatchParent,\r
+                HeightSpecification = LayoutParamPolicies.MatchParent,\r
+\r
+                Position = new Position(0, 0),\r
+            };\r
+\r
+            Tizen.Log.Debug("NUI", String.Format($"RenameContent Push"));\r
+\r
+\r
+            navigator.Push(renamepage);\r
+\r
+        }\r
 \r
     }\r
 }\r

diff --git a/SettingView/SettingRenameDevicePage.cs b/SettingView/SettingRenameDevicePage.cs
new file mode 100644 (file)
index 0000000..5c0cd27
--- /dev/null
+++ b/SettingView/SettingRenameDevicePage.cs
@@ -0,0 +1,138 @@
+/*\r
+ *  Copyright (c) 2022 Samsung Electronics Co., Ltd All Rights Reserved\r
+ *\r
+ *  Licensed under the Apache License, Version 2.0 (the "License");\r
+ *  you may not use this file except in compliance with the License.\r
+ *  You may obtain a copy of the License at\r
+ *\r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ *  Unless required by applicable law or agreed to in writing, software\r
+ *  distributed under the License is distributed on an "AS IS" BASIS,\r
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ *  See the License for the specific language governing permissions and\r
+ *  limitations under the License\r
+ */\r
+\r
+using System;\r
+using Tizen.NUI;\r
+using Tizen.NUI.BaseComponents;\r
+using Tizen.NUI.Components;\r
+using Tizen.Applications;\r
+\r
+using SettingAppTextResopurces.TextResources;\r
+\r
+namespace SettingView\r
+{\r
+    class SettingRenameDevicePage : ContentPage\r
+    {\r
+\r
+        protected Window mWindow;\r
+        protected string mTitle;\r
+\r
+        private const int MAX_DEVICE_NAME_LEN = 32;\r
+        TextField mTextField;\r
+        public SettingRenameDevicePage(Window window)\r
+            : base()\r
+        {\r
+            mWindow = window;\r
+\r
+            mTitle = Resources.IDS_ST_BUTTON_BACK;\r
+\r
+            mTextField = null;\r
+\r
+            Content = CreateContent(window);\r
+            AppBar = CreateAppBar(mTitle);\r
+        }\r
+\r
+        protected AppBar CreateAppBar(string title)\r
+        {\r
+            var appBar = new AppBar()\r
+            {\r
+                Title = title,\r
+                AutoNavigationContent = false,\r
+            };\r
+\r
+            var appBarStyle = ThemeManager.GetStyle("Tizen.NUI.Components.AppBar");\r
+\r
+            var navigationContent = new Button(((AppBarStyle)appBarStyle).BackButton);\r
+            navigationContent.Clicked += (o, e) =>\r
+            {\r
+                if (mWindow != null)\r
+                {\r
+                    Navigator navigator = mWindow.GetDefaultNavigator();\r
+                    navigator.Pop();\r
+                }\r
+            };\r
+            appBar.NavigationContent = navigationContent;\r
+            //appBarStyle.Dispose();\r
+\r
+            return appBar;\r
+        }\r
+\r
+        protected View CreateContent(Window window)\r
+        {\r
+            var content = new View()\r
+            {\r
+\r
+                WidthSpecification = LayoutParamPolicies.MatchParent,\r
+                HeightSpecification = LayoutParamPolicies.MatchParent,\r
+                Layout = new LinearLayout()\r
+                {\r
+                    HorizontalAlignment = HorizontalAlignment.Center,\r
+                    LinearOrientation = LinearLayout.Orientation.Vertical,\r
+                },\r
+            };\r
+\r
+            var textTitle = SettingItemCreator.CreateItemTitle(Resources.IDS_ST_HEADER_RENAME_DEVICE);\r
+            content.Add(textTitle);\r
+\r
+            var textSubTitle = new TextLabel(Resources.IDS_ST_BODY_DEVICE_NAMES_ARE_DISPLAYED)\r
+            {\r
+                MultiLine = true,\r
+                LineWrapMode = LineWrapMode.Character,\r
+                Size2D = new Size2D(window.WindowSize.Width-20*2, 100),\r
+            };\r
+            content.Add(textSubTitle);\r
+\r
+            String name = Vconf.GetString("db/setting/device_name");\r
+\r
+            PropertyMap placeholder = new PropertyMap();\r
+            placeholder.Add("color", new PropertyValue(Color.CadetBlue));\r
+            placeholder.Add("fontFamily", new PropertyValue("Serif"));\r
+            placeholder.Add("pointSize", new PropertyValue(25.0f));\r
+\r
+            mTextField = new TextField\r
+            {\r
+                BackgroundColor = Color.White,\r
+\r
+                Placeholder = placeholder,\r
+\r
+                MaxLength = MAX_DEVICE_NAME_LEN,\r
+                EnableCursorBlink = true,\r
+                Text = name,\r
+            };\r
+            content.Add(mTextField);\r
+\r
+\r
+            var button = new Button()\r
+            {\r
+                // WidthSpecification = LayoutParamPolicies.MatchParent,\r
+                // HeightSpecification = LayoutParamPolicies.MatchParent,\r
+                Text = Resources.IDS_ST_BUTTON_OK\r
+            };\r
+            button.Clicked += (o, e) =>\r
+            {\r
+                // Change Device Name\r
+                Vconf.SetString("db/setting/device_name", mTextField.Text);\r
+\r
+                Navigator navigator = mWindow.GetDefaultNavigator();\r
+                navigator.Pop();\r
+                //RequestWidgetPop();\r
+            };\r
+            content.Add(button);\r
+\r
+            return content;\r
+        }\r
+    }\r
+}\r

diff --git a/SettingView/tizen-manifest.xml b/SettingView/tizen-manifest.xml
index 12b6087a6044c597ebd2c640078530988949161a..dd5708280cbd5cefa31c46be2a71e0ba09611a26 100644 (file)
--- a/SettingView/tizen-manifest.xml
+++ b/SettingView/tizen-manifest.xml
@@ -10,6 +10,8 @@
     </ui-application>\r
     <shortcut-list />\r
     <privileges>\r
+        <privilege>http://tizen.org/privilege/systemsettings.admin</privilege>\r
+\r
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>\r
         <privilege>http://tizen.org/privilege/datasharing</privilege>\r
         <privilege>http://tizen.org/privilege/widget.viewer</privilege>\r

diff --git a/packaging/org.tizen.SettingView-1.0.0.tpk b/packaging/org.tizen.SettingView-1.0.0.tpk
index b3c763d374edaaf2bf54ddbbb53b62beb034a70e..3914a96d9fcee1e60b87ecc0c8cf7d494988cbb6 100644 (file)
Binary files a/packaging/org.tizen.SettingView-1.0.0.tpk and b/packaging/org.tizen.SettingView-1.0.0.tpk differ

diff --git a/packaging/org.tizen.cssettings-1.0.0.tpk b/packaging/org.tizen.cssettings-1.0.0.tpk
index e90bb28357fbfc1081d3c88f788bd79f65f599be..53b3926431c3056632b91ada9a69f12d3cfbcf7a 100644 (file)
Binary files a/packaging/org.tizen.cssettings-1.0.0.tpk and b/packaging/org.tizen.cssettings-1.0.0.tpk differ