Replace deviced interop with System.Display

- use Tizen.System.Display class

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

diff --git a/SettingMain/Interop/Interop.Deviced.cs b/SettingMain/Interop/Interop.Deviced.cs
deleted file mode 100644 (file)
index 0365da3..0000000
--- a/SettingMain/Interop/Interop.Deviced.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-/*\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 System.Runtime.InteropServices;\r
-using static SettingMain.Vconf;\r
-\r
-namespace SettingMain\r
-{\r
-    internal static partial class Interop\r
-    {\r
-        internal static partial class Deviced\r
-        {\r
-            private const string LibraryAlarm = "libdeviced.so.0.1.0";\r
-\r
-            [DllImport(LibraryAlarm, EntryPoint = "display_set_brightness_with_setting")]\r
-            internal static extern int Display_SetBrightnessWithSetting(int brightness);\r
-\r
-        }\r
-    }\r
-}\r

diff --git a/SettingMain/SettingContent_Display.cs b/SettingMain/SettingContent_Display.cs
index 41551c0ec0d27474c8a22a05267bf8c55e320385..90e07dce37e84ea74f7c678f9253586dadf1dd9f 100644 (file)
--- a/SettingMain/SettingContent_Display.cs
+++ b/SettingMain/SettingContent_Display.cs
@@ -20,11 +20,8 @@ using Tizen.NUI;
 using Tizen.NUI.BaseComponents;\r
 using Tizen.NUI.Components;\r
 using Tizen.Applications;\r
-\r
 using Tizen.System;\r
 \r
-using System.Runtime.InteropServices;\r
-\r
 using SettingAppTextResopurces.TextResources;\r
 \r
 namespace SettingMain\r
@@ -34,36 +31,30 @@ namespace SettingMain
         private static readonly string[] mIconPath  = {\r
             "brightness_icon/settings_ic_brightness_00.png",\r
             "brightness_icon/settings_ic_brightness_01.png",\r
-            "brightness_icon/settings_ic_brightness_02.png",\r
-            "brightness_icon/settings_ic_brightness_03.png",\r
-            "brightness_icon/settings_ic_brightness_04.png",\r
-            "brightness_icon/settings_ic_brightness_05.png",\r
-            "brightness_icon/settings_ic_brightness_06.png",\r
-            "brightness_icon/settings_ic_brightness_07.png",\r
-            "brightness_icon/settings_ic_brightness_08.png",\r
-            "brightness_icon/settings_ic_brightness_09.png",\r
-            "brightness_icon/settings_ic_brightness_10.png",\r
-            "brightness_icon/settings_ic_brightness_11.png"\r
         };\r
-        static void GetBrightnessSliderIcon(int level, out string iconpath) \r
+        static void GetBrightnessSliderIcon(int brightness, out string iconpath) \r
         {\r
+            int iconlevel = mIconPath.Length;\r
 \r
-            int mapped_level;\r
-            if (level <= 1)\r
-                       mapped_level = 0;\r
-               else if (level >= 100)\r
-                       mapped_level = 11;\r
-               else if (level > 1 && level <= 9)\r
-                       mapped_level = 1;\r
-               else\r
-                       mapped_level = (level / 10);\r
-\r
-               Tizen.Log.Debug("NUI", "mapped_level:"+mapped_level.ToString());\r
+            int mapped_level = 0;\r
+            if (iconlevel > 1)\r
+            {\r
+                int minbrightness = 1;\r
+                int maxbrightness = Display.Displays[0].MaxBrightness;\r
+                if (brightness > minbrightness)\r
+                {\r
+                    int levelcount = maxbrightness - minbrightness;\r
+                    int level = brightness - (minbrightness + 1);\r
+                    mapped_level = (level * (iconlevel - 1) / levelcount) + 1;\r
+                }\r
+            }\r
+            Tizen.Log.Debug("NUI", "mapped_level:" + mapped_level.ToString());\r
 \r
             iconpath = resPath + SETTING_ICON_PATH_CFG + mIconPath[mapped_level];\r
         }\r
 \r
 \r
+        private SliderItem mBrightnessItem;\r
         private DefaultLinearItem mFontItem;\r
         private DefaultLinearItem mScreenTimeoutItem;\r
 \r
@@ -72,6 +63,7 @@ namespace SettingMain
         {\r
             mTitle = Resources.IDS_ST_HEADER_DISPLAY;\r
 \r
+            mBrightnessItem = null;\r
             mFontItem = null;\r
             mScreenTimeoutItem = null;\r
         }\r
@@ -94,27 +86,29 @@ namespace SettingMain
 \r
             DefaultLinearItem item = null;\r
 \r
-            int level = 50;\r
-\r
-            GetBrightnessSliderIcon(level, out string iconpath);\r
+            if (Display.NumberOfDisplays > 0)\r
+            {\r
 \r
+                int brightness = Display.Displays[0].Brightness;\r
+                int maxbrightness = Display.Displays[0].MaxBrightness;\r
 \r
-            //VCONFKEY_SETAPPL_LCD_BRIGHTNESS\r
-            int brightness = Vconf.GetInt("db/setting/Brightness");\r
+                GetBrightnessSliderIcon(brightness, out string iconpath);\r
 \r
-            Tizen.Log.Debug("NUI", "GET brightness : " + brightness.ToString());\r
+                Tizen.Log.Debug("NUI", "GET brightness : " + brightness.ToString());\r
 \r
-            item = SettingItemCreator.CreateItemWithCheck(Resources.IDS_ST_BODY_BRIGHTNESS_M_POWER_SAVING);\r
-            var slideritem = SettingItemCreator.CreateSliderItem("BRIGHTNESS", iconpath, brightness / 100.0f);\r
-            if (slideritem != null) {\r
-                slideritem.mSlider.ValueChanged += OnValueChanged;\r
-                slideritem.mSlider.SlidingStarted += OnSlidingStarted;\r
-                slideritem.mSlider.SlidingFinished += OnSlidingFinished;\r
+                item = SettingItemCreator.CreateItemWithCheck(Resources.IDS_ST_BODY_BRIGHTNESS_M_POWER_SAVING);\r
+                var slideritem = SettingItemCreator.CreateSliderItem("BRIGHTNESS", iconpath, (brightness*1.0f)/ maxbrightness);\r
+                mBrightnessItem = slideritem;\r
+                if (slideritem != null)\r
+                {\r
+                    slideritem.mSlider.ValueChanged += OnValueChanged;\r
+                    slideritem.mSlider.SlidingStarted += OnSlidingStarted;\r
+                    slideritem.mSlider.SlidingFinished += OnSlidingFinished;\r
 \r
-                content.Add(slideritem);\r
+                    content.Add(slideritem);\r
+                }\r
             }\r
-\r
-\r
+            \r
             SystemSettingsFontSize fontSize = SystemSettings.FontSize;\r
             string fontType = SystemSettings.FontType;\r
 \r
@@ -197,27 +191,33 @@ namespace SettingMain
         }\r
 \r
 \r
-        private static void OnValueChanged(object sender, SliderValueChangedEventArgs args)\r
+        private void OnValueChanged(object sender, SliderValueChangedEventArgs args)\r
         {\r
         }\r
 \r
-        private static void OnSlidingStarted(object sender, SliderSlidingStartedEventArgs args)\r
+        private void OnSlidingStarted(object sender, SliderSlidingStartedEventArgs args)\r
         {\r
         }\r
 \r
-        private static void OnSlidingFinished(object sender, SliderSlidingFinishedEventArgs args)\r
+        private void OnSlidingFinished(object sender, SliderSlidingFinishedEventArgs args)\r
         {\r
             var slider = sender as Slider;\r
 \r
+            int minbrightness = 1;\r
+            int maxbrightness = Display.Displays[0].MaxBrightness;\r
+                        \r
+            int brightness = (int)(slider.CurrentValue * (maxbrightness- minbrightness)) + minbrightness;\r
+            if (brightness >= maxbrightness) brightness = maxbrightness;\r
+\r
+            Tizen.Log.Debug("NUI", string.Format("maxbrightness : {0}, brightness : {1}", maxbrightness, brightness));\r
 \r
-            int BRIGHTNESS_MIN = 1;\r
-            int BRIGHTNESS_MAX = 100;\r
+            if (mBrightnessItem != null)\r
+            {\r
+                GetBrightnessSliderIcon(brightness, out string iconpath);\r
+                mBrightnessItem.mIcon.SetImage(iconpath);\r
+           }\r
 \r
-            int brightness = (int)(slider.CurrentValue * (BRIGHTNESS_MAX - BRIGHTNESS_MIN)) + BRIGHTNESS_MIN;\r
-            Tizen.Log.Debug("NUI", "SET brightness : " + brightness.ToString());\r
-            //VCONFKEY_SETAPPL_LCD_BRIGHTNESS\r
-            //Vconf.SetInt("db/setting/Brightness", brightness);\r
-            Interop.Deviced.Display_SetBrightnessWithSetting(brightness);\r
+            Display.Displays[0].Brightness = brightness;\r
         }\r
 \r
     }\r

diff --git a/SettingMain/SettingContent_Storage.cs b/SettingMain/SettingContent_Storage.cs
index 80a4c0cf199e278af1248a5dadc0f296694141e7..b53bcff051a13fc4690fdf893f0f4168b1864020 100644 (file)
--- a/SettingMain/SettingContent_Storage.cs
+++ b/SettingMain/SettingContent_Storage.cs
@@ -447,9 +447,6 @@ namespace SettingMain
             return string.Format("{0:0.0}", size) + " GB";\r
         }\r
 \r
-\r
-\r
-\r
         protected override void OnCreate(string contentInfo, Window window)\r
         {\r
             base.OnCreate(contentInfo, window);\r

diff --git a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_00.png b/SettingMain/res/icons/brightness_icon/settings_ic_brightness_00.png
index 5d32996a82219a8df1dcc0391c8262f84f04730a..8c9fec2ce400b90d6d9f20bb71136ac8ab87e4fb 100644 (file)
Binary files a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_00.png and b/SettingMain/res/icons/brightness_icon/settings_ic_brightness_00.png differ

diff --git a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_02.png b/SettingMain/res/icons/brightness_icon/settings_ic_brightness_02.png
deleted file mode 100644 (file)
index 5d32996..0000000
Binary files a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_02.png and /dev/null differ

diff --git a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_03.png b/SettingMain/res/icons/brightness_icon/settings_ic_brightness_03.png
deleted file mode 100644 (file)
index 5d32996..0000000
Binary files a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_03.png and /dev/null differ

diff --git a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_04.png b/SettingMain/res/icons/brightness_icon/settings_ic_brightness_04.png
deleted file mode 100644 (file)
index 5d32996..0000000
Binary files a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_04.png and /dev/null differ

diff --git a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_05.png b/SettingMain/res/icons/brightness_icon/settings_ic_brightness_05.png
deleted file mode 100644 (file)
index 5d32996..0000000
Binary files a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_05.png and /dev/null differ

diff --git a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_06.png b/SettingMain/res/icons/brightness_icon/settings_ic_brightness_06.png
deleted file mode 100644 (file)
index 5d32996..0000000
Binary files a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_06.png and /dev/null differ

diff --git a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_07.png b/SettingMain/res/icons/brightness_icon/settings_ic_brightness_07.png
deleted file mode 100644 (file)
index 5d32996..0000000
Binary files a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_07.png and /dev/null differ

diff --git a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_08.png b/SettingMain/res/icons/brightness_icon/settings_ic_brightness_08.png
deleted file mode 100644 (file)
index 5d32996..0000000
Binary files a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_08.png and /dev/null differ

diff --git a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_09.png b/SettingMain/res/icons/brightness_icon/settings_ic_brightness_09.png
deleted file mode 100644 (file)
index 5d32996..0000000
Binary files a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_09.png and /dev/null differ

diff --git a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_10.png b/SettingMain/res/icons/brightness_icon/settings_ic_brightness_10.png
deleted file mode 100644 (file)
index 5d32996..0000000
Binary files a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_10.png and /dev/null differ

diff --git a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_11.png b/SettingMain/res/icons/brightness_icon/settings_ic_brightness_11.png
deleted file mode 100644 (file)
index 5d32996..0000000
Binary files a/SettingMain/res/icons/brightness_icon/settings_ic_brightness_11.png and /dev/null differ

diff --git a/packaging/org.tizen.SettingView-1.0.0.tpk b/packaging/org.tizen.SettingView-1.0.0.tpk
index 8ac99aa357e50e473c53dada48d4bc0ac36a89fb..e7ebb3144fdc63becbc2e47ea9c3a9dc2ce4fd1f 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 0b9f59f580c53d4661c0bb8dd3e1edfc4b7dec5f..5de2cb3070227d019ed82dffa72cd8cd436e7d6f 100644 (file)
Binary files a/packaging/org.tizen.cssettings-1.0.0.tpk and b/packaging/org.tizen.cssettings-1.0.0.tpk differ