Add detail view 16/282816/2
authorWootak Jung <wootak.jung@samsung.com>
Wed, 12 Oct 2022 02:55:43 +0000 (11:55 +0900)
committerWootak Jung <wootak.jung@samsung.com>
Wed, 12 Oct 2022 03:09:10 +0000 (12:09 +0900)
add device icon property

Change-Id: I469b1420bc6846f043f0a9f616edd7d77edf4eaf
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>
32 files changed:
SettingBluetooth/SettingBluetooth/Controller/DeviceController.cs
SettingBluetooth/SettingBluetooth/Model/BtDevice.cs
SettingBluetooth/SettingBluetooth/Model/BtEnumerations.cs
SettingBluetooth/SettingBluetooth/View/BtDetailView.cs
SettingBluetooth/SettingBluetooth/View/BtDeviceView.cs
SettingBluetooth/SettingBluetooth/View/BtMainView.cs
SettingBluetooth/SettingBluetooth/res/images/icon.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/images/icon_camera.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/images/icon_computer.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/images/icon_display.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/images/icon_gaming.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/images/icon_headphone.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/images/icon_headset.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/images/icon_health.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/images/icon_keyboard.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/images/icon_mobilephone.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/images/icon_mouse.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/images/icon_network_infrastructure.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/images/icon_printer.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/images/icon_unknown.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/images/icon_wrist.png [new file with mode: 0644]
SettingBluetooth/SettingBluetooth/res/locale/Resources.Designer.cs
SettingBluetooth/SettingBluetooth/res/locale/Resources.en.resx
SettingBluetooth/SettingBluetooth/res/locale/Resources.ko-KR.resx
SettingBluetooth/SettingBluetooth/res/locale/Resources.resx
SettingBluetooth/SettingView/res/images/close.png [new file with mode: 0644]
SettingBluetooth/SettingView/res/images/leftCorner.png [new file with mode: 0644]
SettingBluetooth/SettingView/res/images/maximalize.png [new file with mode: 0644]
SettingBluetooth/SettingView/res/images/minimalize.png [new file with mode: 0644]
SettingBluetooth/SettingView/res/images/rightCorner.png [new file with mode: 0644]
SettingBluetooth/SettingView/res/images/smallwindow.png [new file with mode: 0644]
packaging/org.tizen.cssetting-bluetooth-1.0.0.tpk

index f519305b47fe29098cffd018481eb4b215389506..88e55352985c05cf496054ae2a4e5b5915fa638f 100644 (file)
@@ -32,12 +32,13 @@ namespace SettingBluetooth.Controller
             DialogPage.ShowAlertDialog(Resources.IDS_BT_HEADER_DISCONNECT_DEVICE_ABB, String.Format(Resources.IDS_WMGR_POP_THIS_WILL_END_YOUR_CONNECTION_WITH_PS, btDevice.Name), cancelButton, disconnectButton);
         }
 
-        private static void ConnectA2dp(BtDevice device)
+        internal static void ConnectA2dp(BtDevice device)
         {
+            Log.Info(Program.LogTag, "Connect to the remote audio device");
             device.ConnectAudio();
         }
 
-        private static void DisconnectA2dp(BtDevice btDevice)
+        internal static void DisconnectA2dp(BtDevice btDevice)
         {
             var disconnectButton = new Button()
             {
@@ -54,6 +55,7 @@ namespace SettingBluetooth.Controller
 
         private static void ConnectHid(BtDevice device)
         {
+            Log.Info(Program.LogTag, "Connect to the remote hid device");
             device.ConnectHid();
         }
 
@@ -78,37 +80,35 @@ namespace SettingBluetooth.Controller
             var device = deviceItem.BindingContext as Device;
             Log.Info(Program.LogTag, "DeviceItem clicked. Address: " + device.Address + ", Name: " + device.Name);
 
-            if (device.BtItem.IsPaired)
+            if (device.BtDevice.IsPaired)
             {
-                if (device.BtItem.IsA2dpSupported)
+                if (device.BtDevice.IsA2dpSupported)
                 {
-                    if (device.BtItem.IsA2dpConnected)
+                    if (device.BtDevice.IsA2dpConnected)
                     {
-                        DisconnectA2dp(device.BtItem);
+                        DisconnectA2dp(device.BtDevice);
                     }
                     else
                     {
-                        Log.Info(Program.LogTag, "Connect to the remote audio device");
-                        ConnectA2dp(device.BtItem);
+                        ConnectA2dp(device.BtDevice);
                     }
                 }
-                else if (device.BtItem.IsHidSupported)
+                else if (device.BtDevice.IsHidSupported)
                 {
-                    if (device.BtItem.IsHidConnected)
+                    if (device.BtDevice.IsHidConnected)
                     {
-                        DisconnectHid(device.BtItem);
+                        DisconnectHid(device.BtDevice);
                     }
                     else
                     {
-                        Log.Info(Program.LogTag, "Connect to the remote hid device");
-                        ConnectHid(device.BtItem);
+                        ConnectHid(device.BtDevice);
                     }
                 }
             }
             else
             {
                 Log.Info(Program.LogTag, "Pair to the remote device");
-                device.BtItem.Pair();
+                device.BtDevice.Pair();
             }
         }
     }
index fc78f773b4f9117175ba4559d9afa6ecba741fed..4ce0a43eafbb05ba2d774a2d2a3ca85bec30983f 100644 (file)
@@ -16,6 +16,7 @@ namespace SettingBluetooth.Model
         private BluetoothDevice mBluetoothDevice;
         private string[] mServiceUuids = null;
         private BluetoothServiceClassType mServiceMask = 0;
+        private BtDeviceIcon mDeviceIcon;
 
         private bool mIsA2dpSupported = false;
         private BluetoothAudio mBluetoothAudio = null;
@@ -48,6 +49,81 @@ namespace SettingBluetooth.Model
                     mIsHidSupported = true;
                 }
             }
+
+            switch (device.Class.MajorDeviceClassType)
+            {
+                case BluetoothMajorDeviceClassType.Computer:
+                    mDeviceIcon = BtDeviceIcon.Computer;
+                    break;
+                case BluetoothMajorDeviceClassType.Phone:
+                    mDeviceIcon = BtDeviceIcon.Phone;
+                    break;
+                case BluetoothMajorDeviceClassType.AudioVideo:
+                    if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.AudioVideoHeadphones)
+                    {
+                        mDeviceIcon = BtDeviceIcon.Headphone;
+                    }
+                    else if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.AudioVideoLoudspeaker)
+                    {
+                        mDeviceIcon = BtDeviceIcon.Display;
+                    }
+                    else
+                    {
+                        mDeviceIcon = BtDeviceIcon.Headset;
+                    }
+                    break;
+                case BluetoothMajorDeviceClassType.LanNetworkAccessPoint:
+                    mDeviceIcon = BtDeviceIcon.Network;
+                    break;
+                case BluetoothMajorDeviceClassType.Imaging:
+                    if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.ImagingPrinter)
+                    {
+                        mDeviceIcon = BtDeviceIcon.Printer;
+                    }
+                    else if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.ImagingCamera)
+                    {
+                        mDeviceIcon = BtDeviceIcon.Camera;
+                    }
+                    else
+                    {
+                        mDeviceIcon = BtDeviceIcon.Display;
+                    }
+                    break;
+                case BluetoothMajorDeviceClassType.Peripheral:
+                    if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.PeripheralKeyBoard)
+                    {
+                        mDeviceIcon = BtDeviceIcon.Keyboard;
+                    }
+                    else if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.PeripheralPointingDevice)
+                    {
+                        mDeviceIcon = BtDeviceIcon.Mouse;
+                    }
+                    else if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.PeripheralGamePad)
+                    {
+                        mDeviceIcon = BtDeviceIcon.Gaming;
+                    }
+                    else
+                    {
+                        mDeviceIcon = BtDeviceIcon.Mouse;
+                    }
+                    break;
+                case BluetoothMajorDeviceClassType.Health:
+                    mDeviceIcon = BtDeviceIcon.Health;
+                    break;
+                case BluetoothMajorDeviceClassType.Wearable:
+                    if (device.Class.MinorDeviceClassType == BluetoothMinorDeviceClassType.WearableWristWatch)
+                    {
+                        mDeviceIcon = BtDeviceIcon.Watch;
+                    }
+                    else
+                    {
+                        mDeviceIcon = BtDeviceIcon.Unknown;
+                    }
+                    break;
+                default:
+                    mDeviceIcon = BtDeviceIcon.Unknown;
+                    break;
+            }
         }
 
         // for dummy instance (No devices found, Paired device)
@@ -97,6 +173,14 @@ namespace SettingBluetooth.Model
             }
         }
 
+        internal BtDeviceIcon DeviceIcon
+        {
+            get
+            {
+                return mDeviceIcon;
+            }
+        }
+
         internal bool IsA2dpSupported
         {
             get
index 29abae2285f564e5fddce4558ccc53dea74b7def..cdd6487a488e90aea223874877c42ee91fc7d9d2 100644 (file)
@@ -28,4 +28,22 @@ namespace SettingBluetooth.Model
         Disconnecting,
         ServiceSearching,
     }
+
+    public enum BtDeviceIcon
+    {
+        Phone,
+        Headset,
+        Headphone,
+        Computer,
+        Keyboard,
+        Mouse,
+        Printer,
+        Health,
+        Network,
+        Gaming,
+        Display,
+        Camera,
+        Watch,
+        Unknown,
+    }
 }
index cd0a487fef1edecfa083bd87b40ed343027f4012..9f67aaa3471af9adc07505f325e87cbaef331624 100644 (file)
-using System;
+using SettingBluetooth.res.locale;
+using System;
 using System.Collections.Generic;
 using System.Text;
+using Tizen.NUI;
+using Tizen.NUI.Components;
+using Tizen.NUI.BaseComponents;
+using Tizen;
+using SettingBluetooth.Controller;
 
 namespace SettingBluetooth
 {
-    class BtDetailView
+    internal static class BtDetailView
     {
+        static View mDetailView;
+        static ContentPage mDetailPage;
+
+        internal static void CreateDetailView(Device device)
+        {
+            Window window = NUIApplication.GetDefaultWindow();
+
+            var appBar = new AppBar()
+            {
+                Title = Resources.IDS_BT_BODY_DETAILS,
+            };
+
+            mDetailView = new View()
+            {
+                Layout = new LinearLayout()
+                {
+                    LinearOrientation = LinearLayout.Orientation.Vertical,
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                },
+                WidthSpecification = LayoutParamPolicies.MatchParent,
+                HeightSpecification = LayoutParamPolicies.MatchParent,
+            };
+
+            var deviceName = new DefaultLinearItem()
+            {
+                WidthSpecification = LayoutParamPolicies.MatchParent,
+                Text = device.Name,
+                SubText = Resources.IDS_BT_BODY_DEVICENAME,
+            };
+            mDetailView.Add(deviceName);
+
+            var unpairButton = new DefaultLinearItem()
+            {
+                WidthSpecification = LayoutParamPolicies.MatchParent,
+                Text = Resources.IDS_BT_OPT_UNPAIR,
+            };
+            unpairButton.Clicked += (obj, ev) =>
+            {
+                Log.Info(Program.LogTag, "Unpair to the remote device. Address: " + device.BtDevice.Address + ", Name: " + device.BtDevice.Name);
+                device.BtDevice.Unpair();
+                window.GetDefaultNavigator().Pop();
+            };
+            mDetailView.Add(unpairButton);
+
+            var connOption = new DefaultLinearItem()
+            {
+                WidthSpecification = LayoutParamPolicies.MatchParent,
+                Text = Resources.IDS_BT_BODY_CONNECTION_OPTIONS,
+            };
+            mDetailView.Add(connOption);
+
+            if (device.BtDevice.IsA2dpSupported)
+            {
+                var mediaAudioItem = new DefaultLinearItem()
+                {
+                    WidthSpecification = LayoutParamPolicies.MatchParent,
+                    Text = Resources.IDS_BT_BODY_MEDIA_AUDIO,
+                };
+                var mediaAudioSwitch = new Switch()
+                {
+                    IsSelected = device.BtDevice.IsA2dpConnected ? true : false,
+                };
+                mediaAudioSwitch.SelectedChanged += (obj, ev) =>
+                {
+                    if (ev.IsSelected)
+                    {
+                        DeviceController.ConnectA2dp(device.BtDevice);
+                    }
+                    else
+                    {
+                        DeviceController.DisconnectA2dp(device.BtDevice);
+                    }
+                };
+                mediaAudioItem.Extra = mediaAudioSwitch;
+                mDetailView.Add(mediaAudioItem);
+            }
+
+            mDetailPage = new ContentPage()
+            {
+                AppBar = appBar,
+                Content = mDetailView,
+            };
+
+            window.GetDefaultNavigator().Push(mDetailPage);
+        }
     }
 }
index 2645713e652ea1bf72b3cf0e7f1cbfc8da98bff4..a1d6cd154259a38577488a5c5a5888f509ebeb74 100644 (file)
@@ -13,13 +13,14 @@ namespace SettingBluetooth
 {
     public class Device : INotifyPropertyChanged
     {
-        string mIconDir = Tizen.Applications.Application.Current.DirectoryInfo.Resource + "icon.png";
+        private string mResourcePath = Tizen.Applications.Application.Current.DirectoryInfo.Resource;
+        private string mIconDir;
         private string mAddress;
         private string mName;
         //private bool connected;
         //private bool registered;
         public event PropertyChangedEventHandler PropertyChanged;
-        BtDevice mBtItem;
+        BtDevice mBtDevice;
         private string mState;
 
         private void OnPropertyChanged(string propertyName)
@@ -38,14 +39,63 @@ namespace SettingBluetooth
         {
             mAddress = btDevice.Address;
             mName = btDevice.Name;
-            mBtItem = btDevice;
+            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";
         }
 
-        internal BtDevice BtItem
+        internal BtDevice BtDevice
         {
             get
             {
-                return mBtItem;
+                return mBtDevice;
             }
         }
 
@@ -89,32 +139,12 @@ namespace SettingBluetooth
             {
                 return mIconDir;
             }
+            set
+            {
+                mIconDir = value;
+                OnPropertyChanged("ImageUrl");
+            }
         }
-
-        //public bool Connected
-        //{
-        //    get
-        //    {
-        //        return connected;
-        //    }
-        //    set
-        //    {
-        //        connected = value;
-        //        OnPropertyChanged("Connected");
-        //    }
-        //}
-        //public bool Registered
-        //{
-        //    get
-        //    {
-        //        return registered;
-        //    }
-        //    set
-        //    {
-        //        registered = value;
-        //        OnPropertyChanged("Registered");
-        //    }
-        //}
     }
 
     public class DeviceCollection : ObservableCollection<Device>
@@ -203,33 +233,31 @@ namespace SettingBluetooth
         internal void UpdateState(BtDevice btDevice)
         {
             var device = FindDevice(btDevice);
-            string state = null;
             switch (btDevice.DeviceState)
             {
                 case BtDeviceState.Idle:
                 case BtDeviceState.Unpaired:
-                    state = "";
+                    device.State = "";
                     break;
                 case BtDeviceState.Pairing:
                 case BtDeviceState.Connecting:
-                    state = Resources.IDS_BT_SBODY_CONNECTING_ING;
+                    device.State = Resources.IDS_BT_SBODY_CONNECTING_ING;
                     break;
                 case BtDeviceState.Unpairing:
                 case BtDeviceState.Disconnecting:
-                    state = Resources.IDS_BT_BODY_DISCONNECTING;
+                    device.State = Resources.IDS_BT_BODY_DISCONNECTING;
                     break;
                 case BtDeviceState.Paired:
-                    state = Resources.IDS_BT_BODY_PAIRED;
+                    device.State = Resources.IDS_BT_BODY_PAIRED;
                     break;
                 case BtDeviceState.Connected:
-                    state = Resources.IDS_BT_SBODY_CONNECTED_M_STATUS;
+                    device.State = Resources.IDS_BT_SBODY_CONNECTED_M_STATUS;
                     break;
                 case BtDeviceState.ServiceSearching:
-                    state = Resources.IDS_BT_POP_SEARCHING_SERVICES_ING;
+                    device.State = Resources.IDS_BT_POP_SEARCHING_SERVICES_ING;
                     break;
             }
-            //Log.Info(Program.LogTag, "Device(" + btDevice.Address + ") updated. state: " + state);
-            device.State = state;
+            //Log.Info(Program.LogTag, "Device(" + btDevice.Address + ") updated. state: " + device.State);
         }
     }
 }
index 060c28d6dc0f3e14d9bd6b5b2b675123173b039c..752121af476accc58ff69f274503df0a4841b5e3 100644 (file)
@@ -29,7 +29,7 @@ namespace SettingBluetooth
         }
 
         // TODO: Need to move device view related functions to BtDeviceView.cs.
-        private static CollectionView CreateCollectionView(DeviceSource source, bool fixHeight = true)
+        private static CollectionView CreateCollectionView(DeviceSource source, bool isPairedDeviceView = false)
         {
             var view = new CollectionView()
             {
@@ -48,22 +48,26 @@ namespace SettingBluetooth
                     item.Icon.SetBinding(ImageView.ResourceUrlProperty, "ImageUrl");
                     item.Icon.WidthSpecification = 40;
                     item.Icon.HeightSpecification = 40;
-                    var detailButton = new Button // TODO: need to use other type instead of Button
-                    {
-                        Text = "i"
-                    };
-                    detailButton.WidthSpecification = 40;
-                    detailButton.Clicked += (obj, ev) =>
-                    {
-                        Button button = (Button)obj;
-                        var device = button.BindingContext as Device;
-                        Log.Debug(Program.LogTag, "Button clicked. Name: " + device.Name);
-                        // TODO: add BtDetailView with device
-                    };
-                    item.Extra = detailButton;
                     item.Clicked += DeviceController.DeviceItemClicked;
                     item.IsSelectable = false;
 
+                    if (isPairedDeviceView == true)
+                    {
+                        var detailButton = new Button // TODO: need to use other type instead of Button
+                        {
+                            Text = "i"
+                        };
+                        detailButton.WidthSpecification = 40;
+                        detailButton.Clicked += (obj, ev) =>
+                        {
+                            Button button = (Button)obj;
+                            var device = button.BindingContext as Device;
+                            Log.Debug(Program.LogTag, "Button clicked. Name: " + device.Name);
+                            BtDetailView.CreateDetailView(device);
+                        };
+                        item.Extra = detailButton;
+                    }
+
                     return item;
                 }),
 
@@ -86,7 +90,7 @@ namespace SettingBluetooth
                 SelectionMode = ItemSelectionMode.Single,
             };
 
-            if (fixHeight) // for searched view
+            if (isPairedDeviceView == false)
             {
                 view.HeightSpecification = LayoutParamPolicies.MatchParent;
             }
@@ -98,7 +102,7 @@ namespace SettingBluetooth
         private static void AddPairedDeviceView()
         {
             mPairedDevice = new DeviceSource();
-            mPairedDeviceView = CreateCollectionView(mPairedDevice, false);
+            mPairedDeviceView = CreateCollectionView(mPairedDevice, true);
             mPairedDevice.AddDevice(new BtDevice("dummy paired device")); // temporary device
             mPairedDevice.UpdateTitle(Resources.IDS_BT_BODY_PAIRED_DEVICES);
             mMainView.Add(mPairedDeviceView);
@@ -150,10 +154,8 @@ namespace SettingBluetooth
             }
         }
 
-        private static void RemoveAllView()
+        private static void RemovePairedDeviceView()
         {
-            RemoveSearchedDeviceView();
-
             if (mPairedDeviceView)
             {
                 mMainView.Remove(mPairedDeviceView);
@@ -167,7 +169,8 @@ namespace SettingBluetooth
             switch (ev.OperationState)
             {
                 case BtOperationState.Deactivated:
-                    RemoveAllView();
+                    RemoveSearchedDeviceView();
+                    RemovePairedDeviceView();
                     break;
                 case BtOperationState.Deactivating:
                     break;
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon.png b/SettingBluetooth/SettingBluetooth/res/images/icon.png
new file mode 100644 (file)
index 0000000..e50b223
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon.png differ
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_camera.png b/SettingBluetooth/SettingBluetooth/res/images/icon_camera.png
new file mode 100644 (file)
index 0000000..398f268
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_camera.png differ
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_computer.png b/SettingBluetooth/SettingBluetooth/res/images/icon_computer.png
new file mode 100644 (file)
index 0000000..ebb0cd3
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_computer.png differ
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_display.png b/SettingBluetooth/SettingBluetooth/res/images/icon_display.png
new file mode 100644 (file)
index 0000000..159cf56
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_display.png differ
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_gaming.png b/SettingBluetooth/SettingBluetooth/res/images/icon_gaming.png
new file mode 100644 (file)
index 0000000..8f567cb
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_gaming.png differ
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_headphone.png b/SettingBluetooth/SettingBluetooth/res/images/icon_headphone.png
new file mode 100644 (file)
index 0000000..58b3bc4
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_headphone.png differ
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_headset.png b/SettingBluetooth/SettingBluetooth/res/images/icon_headset.png
new file mode 100644 (file)
index 0000000..476db24
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_headset.png differ
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_health.png b/SettingBluetooth/SettingBluetooth/res/images/icon_health.png
new file mode 100644 (file)
index 0000000..91abcf3
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_health.png differ
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_keyboard.png b/SettingBluetooth/SettingBluetooth/res/images/icon_keyboard.png
new file mode 100644 (file)
index 0000000..912f939
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_keyboard.png differ
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_mobilephone.png b/SettingBluetooth/SettingBluetooth/res/images/icon_mobilephone.png
new file mode 100644 (file)
index 0000000..327683f
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_mobilephone.png differ
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_mouse.png b/SettingBluetooth/SettingBluetooth/res/images/icon_mouse.png
new file mode 100644 (file)
index 0000000..9ef4068
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_mouse.png differ
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_network_infrastructure.png b/SettingBluetooth/SettingBluetooth/res/images/icon_network_infrastructure.png
new file mode 100644 (file)
index 0000000..0bf0bff
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_network_infrastructure.png differ
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_printer.png b/SettingBluetooth/SettingBluetooth/res/images/icon_printer.png
new file mode 100644 (file)
index 0000000..d39ff02
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_printer.png differ
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_unknown.png b/SettingBluetooth/SettingBluetooth/res/images/icon_unknown.png
new file mode 100644 (file)
index 0000000..9ab1854
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_unknown.png differ
diff --git a/SettingBluetooth/SettingBluetooth/res/images/icon_wrist.png b/SettingBluetooth/SettingBluetooth/res/images/icon_wrist.png
new file mode 100644 (file)
index 0000000..882b160
Binary files /dev/null and b/SettingBluetooth/SettingBluetooth/res/images/icon_wrist.png differ
index 18a9f84e4778c986ab9692817c66a25bc33f75c5..7094fdb2dc8b622ce26869e8071391bb62d1a86f 100644 (file)
@@ -87,6 +87,33 @@ namespace SettingBluetooth.res.locale {
             }
         }
         
+        /// <summary>
+        ///   과(와) 유사한 지역화된 문자열을 찾습니다.
+        /// </summary>
+        public static string IDS_BT_BODY_CONNECTION_OPTIONS {
+            get {
+                return ResourceManager.GetString("IDS_BT_BODY_CONNECTION_OPTIONS", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   과(와) 유사한 지역화된 문자열을 찾습니다.
+        /// </summary>
+        public static string IDS_BT_BODY_DETAILS {
+            get {
+                return ResourceManager.GetString("IDS_BT_BODY_DETAILS", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   과(와) 유사한 지역화된 문자열을 찾습니다.
+        /// </summary>
+        public static string IDS_BT_BODY_DEVICENAME {
+            get {
+                return ResourceManager.GetString("IDS_BT_BODY_DEVICENAME", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   과(와) 유사한 지역화된 문자열을 찾습니다.
         /// </summary>
@@ -96,6 +123,15 @@ namespace SettingBluetooth.res.locale {
             }
         }
         
+        /// <summary>
+        ///   과(와) 유사한 지역화된 문자열을 찾습니다.
+        /// </summary>
+        public static string IDS_BT_BODY_MEDIA_AUDIO {
+            get {
+                return ResourceManager.GetString("IDS_BT_BODY_MEDIA_AUDIO", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   과(와) 유사한 지역화된 문자열을 찾습니다.
         /// </summary>
@@ -132,6 +168,15 @@ namespace SettingBluetooth.res.locale {
             }
         }
         
+        /// <summary>
+        ///   과(와) 유사한 지역화된 문자열을 찾습니다.
+        /// </summary>
+        public static string IDS_BT_OPT_UNPAIR {
+            get {
+                return ResourceManager.GetString("IDS_BT_OPT_UNPAIR", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   과(와) 유사한 지역화된 문자열을 찾습니다.
         /// </summary>
index 8f57d7385d1bcd56788c529eebfe8ddbc78db466..4d67d9bd3d3be15235d152847ba20793372ee368 100644 (file)
   <data name="IDS_BT_BODY_BLUETOOTH" xml:space="preserve">
     <value>Bluetooth</value>
   </data>
+  <data name="IDS_BT_BODY_CONNECTION_OPTIONS" xml:space="preserve">
+    <value>Connection options</value>
+  </data>
+  <data name="IDS_BT_BODY_DETAILS" xml:space="preserve">
+    <value>Details</value>
+  </data>
+  <data name="IDS_BT_BODY_DEVICENAME" xml:space="preserve">
+    <value>Device name</value>
+  </data>
   <data name="IDS_BT_BODY_DISCONNECTING" xml:space="preserve">
     <value>Disconnecting...</value>
   </data>
+  <data name="IDS_BT_BODY_MEDIA_AUDIO" xml:space="preserve">
+    <value>Media audio</value>
+  </data>
   <data name="IDS_BT_BODY_PAIRED" xml:space="preserve">
     <value>Paired</value>
   </data>
   <data name="IDS_BT_HEADER_DISCONNECT_DEVICE_ABB" xml:space="preserve">
     <value>Disconnect device</value>
   </data>
+  <data name="IDS_BT_OPT_UNPAIR" xml:space="preserve">
+    <value>Unpair</value>
+  </data>
   <data name="IDS_BT_POP_SEARCHING_SERVICES_ING" xml:space="preserve">
     <value>Searching services...</value>
   </data>
index 87163013813bc6ef08ec884f508f7fd3f28764f3..8d6810fa2e46a0f882b95b5b7126463326de6ab2 100644 (file)
   <data name="IDS_BT_BODY_BLUETOOTH" xml:space="preserve">
     <value>블루투스</value>
   </data>
+  <data name="IDS_BT_BODY_CONNECTION_OPTIONS" xml:space="preserve">
+    <value>연결 옵션</value>
+  </data>
+  <data name="IDS_BT_BODY_DETAILS" xml:space="preserve">
+    <value>상세정보</value>
+  </data>
+  <data name="IDS_BT_BODY_DEVICENAME" xml:space="preserve">
+    <value>디바이스 이름</value>
+  </data>
   <data name="IDS_BT_BODY_DISCONNECTING" xml:space="preserve">
     <value>연결을 해제하는 중...</value>
   </data>
+  <data name="IDS_BT_BODY_MEDIA_AUDIO" xml:space="preserve">
+    <value>미디어 오디오</value>
+  </data>
   <data name="IDS_BT_BODY_PAIRED" xml:space="preserve">
     <value>등록됨</value>
   </data>
   <data name="IDS_BT_HEADER_DISCONNECT_DEVICE_ABB" xml:space="preserve">
     <value>디바이스 연결 해제</value>
   </data>
+  <data name="IDS_BT_OPT_UNPAIR" xml:space="preserve">
+    <value>등록 해제</value>
+  </data>
   <data name="IDS_BT_POP_SEARCHING_SERVICES_ING" xml:space="preserve">
     <value>서비스 검색 중...</value>
   </data>
index 7cf6660ca4797b3d5519451e03a11d4a48e4e6d9..baf6e435627d35009b13ec454468f79a35aa4745 100644 (file)
   <data name="IDS_BT_BODY_BLUETOOTH" xml:space="preserve">
     <value />
   </data>
+  <data name="IDS_BT_BODY_CONNECTION_OPTIONS" xml:space="preserve">
+    <value />
+  </data>
+  <data name="IDS_BT_BODY_DETAILS" xml:space="preserve">
+    <value />
+  </data>
+  <data name="IDS_BT_BODY_DEVICENAME" xml:space="preserve">
+    <value />
+  </data>
   <data name="IDS_BT_BODY_DISCONNECTING" xml:space="preserve">
     <value />
   </data>
+  <data name="IDS_BT_BODY_MEDIA_AUDIO" xml:space="preserve">
+    <value />
+  </data>
   <data name="IDS_BT_BODY_PAIRED" xml:space="preserve">
     <value />
   </data>
   <data name="IDS_BT_HEADER_DISCONNECT_DEVICE_ABB" xml:space="preserve">
     <value />
   </data>
+  <data name="IDS_BT_OPT_UNPAIR" xml:space="preserve">
+    <value />
+  </data>
   <data name="IDS_BT_POP_SEARCHING_SERVICES_ING" xml:space="preserve">
     <value />
   </data>
diff --git a/SettingBluetooth/SettingView/res/images/close.png b/SettingBluetooth/SettingView/res/images/close.png
new file mode 100644 (file)
index 0000000..c49e480
Binary files /dev/null and b/SettingBluetooth/SettingView/res/images/close.png differ
diff --git a/SettingBluetooth/SettingView/res/images/leftCorner.png b/SettingBluetooth/SettingView/res/images/leftCorner.png
new file mode 100644 (file)
index 0000000..6f82440
Binary files /dev/null and b/SettingBluetooth/SettingView/res/images/leftCorner.png differ
diff --git a/SettingBluetooth/SettingView/res/images/maximalize.png b/SettingBluetooth/SettingView/res/images/maximalize.png
new file mode 100644 (file)
index 0000000..c5cbbaf
Binary files /dev/null and b/SettingBluetooth/SettingView/res/images/maximalize.png differ
diff --git a/SettingBluetooth/SettingView/res/images/minimalize.png b/SettingBluetooth/SettingView/res/images/minimalize.png
new file mode 100644 (file)
index 0000000..6b116b2
Binary files /dev/null and b/SettingBluetooth/SettingView/res/images/minimalize.png differ
diff --git a/SettingBluetooth/SettingView/res/images/rightCorner.png b/SettingBluetooth/SettingView/res/images/rightCorner.png
new file mode 100644 (file)
index 0000000..68d837f
Binary files /dev/null and b/SettingBluetooth/SettingView/res/images/rightCorner.png differ
diff --git a/SettingBluetooth/SettingView/res/images/smallwindow.png b/SettingBluetooth/SettingView/res/images/smallwindow.png
new file mode 100644 (file)
index 0000000..8f4263b
Binary files /dev/null and b/SettingBluetooth/SettingView/res/images/smallwindow.png differ
index c697ae8fa9b06c6620f8c85c0eb29c30c617e34a..8732af30e3007a425fb86f7b6c6118ecd859036c 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