Enable device icon

Change-Id: I763b005d874cdba090a28ae5a991eac578cbc941
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>

diff --git a/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs b/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs
index a1d6cd154259a38577488a5c5a5888f509ebeb74..7e3d1d76db83b9bf37e9d444c4cb467796af9030 100644 (file)
--- a/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs
+++ b/SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs
@@ -40,55 +40,54 @@ namespace SettingBluetooth
             mAddress = btDevice.Address;
             mName = btDevice.Name;
             mBtDevice = btDevice;
-            //string icon;
-            //switch (btDevice.DeviceIcon)
-            //{
-            //    case BtDeviceIcon.Phone:
-            //        icon = "/images/icon_mobilephone.png"; // TODO: need to replace image file
-            //        break;
-            //    case BtDeviceIcon.Headset:
-            //        icon = "/images/icon_headset.png";
-            //        break;
-            //    case BtDeviceIcon.Headphone:
-            //        icon = "/images/icon_headphone.png";
-            //        break;
-            //    case BtDeviceIcon.Computer:
-            //        icon = "/images/icon_computer.png";
-            //        break;
-            //    case BtDeviceIcon.Keyboard:
-            //        icon = "/images/icon_keyboard.png";
-            //        break;
-            //    case BtDeviceIcon.Mouse:
-            //        icon = "/images/icon_mouse.png";
-            //        break;
-            //    case BtDeviceIcon.Printer:
-            //        icon = "/images/icon_printer.png";
-            //        break;
-            //    case BtDeviceIcon.Health:
-            //        icon = "/images/icon_health.png";
-            //        break;
-            //    case BtDeviceIcon.Network:
-            //        icon = "/images/icon_network_infrastructure.png";
-            //        break;
-            //    case BtDeviceIcon.Gaming:
-            //        icon = "/images/icon_gaming.png";
-            //        break;
-            //    case BtDeviceIcon.Display:
-            //        icon = "/images/icon_display.png";
-            //        break;
-            //    case BtDeviceIcon.Camera:
-            //        icon = "/images/icon_camera.png";
-            //        break;
-            //    case BtDeviceIcon.Watch:
-            //        icon = "/images/icon_wrist.png";
-            //        break;
-            //    case BtDeviceIcon.Unknown:
-            //    default:
-            //        icon = "/images/icon_unknown.png";
-            //        break;
-            //}
-            //mIconDir = mResourcePath + icon;
-            mIconDir = mResourcePath + "/images/icon.png";
+            string icon;
+            switch (btDevice.DeviceIcon)
+            {
+                case BtDeviceIcon.Phone:
+                    icon = "/images/icon_mobilephone.png"; // TODO: need to replace image file
+                    break;
+                case BtDeviceIcon.Headset:
+                    icon = "/images/icon_headset.png";
+                    break;
+                case BtDeviceIcon.Headphone:
+                    icon = "/images/icon_headphone.png";
+                    break;
+                case BtDeviceIcon.Computer:
+                    icon = "/images/icon_computer.png";
+                    break;
+                case BtDeviceIcon.Keyboard:
+                    icon = "/images/icon_keyboard.png";
+                    break;
+                case BtDeviceIcon.Mouse:
+                    icon = "/images/icon_mouse.png";
+                    break;
+                case BtDeviceIcon.Printer:
+                    icon = "/images/icon_printer.png";
+                    break;
+                case BtDeviceIcon.Health:
+                    icon = "/images/icon_health.png";
+                    break;
+                case BtDeviceIcon.Network:
+                    icon = "/images/icon_network_infrastructure.png";
+                    break;
+                case BtDeviceIcon.Gaming:
+                    icon = "/images/icon_gaming.png";
+                    break;
+                case BtDeviceIcon.Display:
+                    icon = "/images/icon_display.png";
+                    break;
+                case BtDeviceIcon.Camera:
+                    icon = "/images/icon_camera.png";
+                    break;
+                case BtDeviceIcon.Watch:
+                    icon = "/images/icon_wrist.png";
+                    break;
+                case BtDeviceIcon.Unknown:
+                default:
+                    icon = "/images/icon_unknown.png";
+                    break;
+            }
+            mIconDir = mResourcePath + icon;
         }
 
         internal BtDevice BtDevice

diff --git a/SettingBluetooth/SettingBluetooth/View/BtMainView.cs b/SettingBluetooth/SettingBluetooth/View/BtMainView.cs
index 752121af476accc58ff69f274503df0a4841b5e3..a926a888bddd7d385e504d8aae04496f08e8309d 100644 (file)
--- a/SettingBluetooth/SettingBluetooth/View/BtMainView.cs
+++ b/SettingBluetooth/SettingBluetooth/View/BtMainView.cs
@@ -45,6 +45,17 @@ namespace SettingBluetooth
                     item.Label.HorizontalAlignment = HorizontalAlignment.Begin;
                     item.SubLabel.SetBinding(TextLabel.TextProperty, "State");
                     item.SubLabel.HorizontalAlignment = HorizontalAlignment.Begin;
+                    ImageViewStyle imageViewStyle = new ImageViewStyle()
+                    {
+                        Color = new Selector<Color>()
+                        {
+                            Normal = new Color("#17234D"),
+                            Focused = new Color("#17234D"),
+                            Pressed = new Color("#FF6200"),
+                            Disabled = new Color("#CACACA"),
+                        },
+                    };
+                    item.Icon = new ImageView(imageViewStyle);
                     item.Icon.SetBinding(ImageView.ResourceUrlProperty, "ImageUrl");
                     item.Icon.WidthSpecification = 40;
                     item.Icon.HeightSpecification = 40;

diff --git a/packaging/org.tizen.cssetting-bluetooth-1.0.0.tpk b/packaging/org.tizen.cssetting-bluetooth-1.0.0.tpk
index 8732af30e3007a425fb86f7b6c6118ecd859036c..786e18a146a0ccdb53e4e6e38f79e17c5e560e72 100644 (file)
Binary files a/packaging/org.tizen.cssetting-bluetooth-1.0.0.tpk and b/packaging/org.tizen.cssetting-bluetooth-1.0.0.tpk differ