From 74535f39616367cfb4bee883753efe460095d40c Mon Sep 17 00:00:00 2001 From: DotnetBuild Date: Wed, 13 Sep 2017 00:00:27 +0900 Subject: [PATCH] Release 4.0.0-preview1-00194 --- packaging/csapi-tizenfx.spec | 2 +- pkg/PlatformFileList.txt | 2 +- .../ElmSharp.Wearable/RotaryEventManager.cs | 174 ++++++++++++++++++++ .../Interop/Interop.Eext.Rotary.cs | 41 ++++- src/ElmSharp/ElmSharp/EvasKeyEventArgs.cs | 2 - src/ElmSharp/ElmSharp/EvasMap.cs | 2 +- src/ElmSharp/ElmSharp/GenGrid.cs | 2 +- src/ElmSharp/ElmSharp/GenItem.cs | 8 +- src/ElmSharp/ElmSharp/SmartEvent.cs | 1 - src/ElmSharp/ElmSharp/Toolbar.cs | 1 - .../Interop/Interop.Libraries.cs | 2 +- .../Tizen.Account.SyncManager/Enumerations.cs | 24 +-- .../Tizen.Account.SyncManager/SyncAdapter.cs | 16 +- .../Tizen.Account.SyncManager/SyncClient.cs | 42 ++--- .../Tizen.Account.SyncManager/SyncJobData.cs | 32 ++-- .../HomeShortcutAddedInfo.cs | 4 +- .../ShortcutAddedInfo.cs | 4 +- .../ShortcutDeletedInfo.cs | 4 +- .../ShortcutTemplate.cs | 10 +- .../WidgetShortcutAddedInfo.cs | 2 +- .../Tizen.Content.MediaContent/MediaDatabase.cs | 16 +- src/Tizen.Location/Tizen.Location/GpsSatellite.cs | 13 +- src/Tizen.Location/Tizen.Location/Locator.cs | 12 +- .../Tizen.Location/SettingChangedEventArgs.cs | 2 +- src/Tizen.Multimedia.Camera/Camera/Camera.cs | 126 +++++++-------- .../Camera/CameraCapabilities.cs | 85 +++++----- .../Camera/CameraCapturingEventArgs.cs | 2 +- .../Camera/CameraDeviceStateChangedEventArgs.cs | 6 +- .../Camera/CameraDisplaySettings.cs | 20 +-- src/Tizen.Multimedia.Camera/Camera/CameraEnums.cs | 126 +++++++-------- .../Camera/CameraErrorOccurredEventArgs.cs | 4 +- .../Camera/CameraFocusStateChangedEventArgs.cs | 5 +- .../Camera/CameraInterruptedEventArgs.cs | 8 +- .../Camera/CameraSettings.cs | 178 ++++++++++----------- .../Camera/CameraStateChangedEventArgs.cs | 12 +- src/Tizen.Multimedia.Camera/Camera/EncodedPlane.cs | 4 +- .../Camera/FaceDetectedEventArgs.cs | 4 +- .../Camera/FaceDetectionData.cs | 2 +- .../Camera/HdrCaptureProgressEventArgs.cs | 4 +- src/Tizen.Multimedia.Camera/Camera/Location.cs | 16 +- .../Camera/MediaPacketPreviewEventArgs.cs | 4 +- .../Camera/PreviewEventArgs.cs | 2 +- src/Tizen.Multimedia.Camera/Camera/PreviewFrame.cs | 8 +- src/Tizen.Multimedia.Camera/Camera/SinglePlane.cs | 2 +- src/Tizen.Multimedia.Camera/Camera/StillImage.cs | 2 +- .../Interop/Interop.MediaControllerServer.cs | 9 ++ .../MediaController/MediaControlServer.cs | 83 +++++++--- .../Tizen.Network.Connection/CellularProfile.cs | 1 + .../Tizen.Network.Connection/ConnectionManager.cs | 2 + .../IAddressInformation.cs | 1 + .../IoTConnectivityClientManager.cs | 2 + .../Tizen.Network.Nsd/INsdBrowser.cs | 2 + .../Tizen.Network.WiFi/WiFiManager.cs | 2 +- .../Tizen.Network.WiFi/WiFiNetwork.cs | 2 +- .../Tizen.Pims.Calendar/CalendarDatabase.cs | 77 +++++---- .../Tizen.Pims.Calendar/DBChangedEventArgs.cs | 40 +++++ src/Tizen.Sensor/Interop/Interop.Sensor.cs | 2 +- .../Tizen.Sensor/Plugins/HeartRateMonitor.cs | 2 +- src/Tizen.Sensor/Tizen.Sensor/Plugins/Pedometer.cs | 2 +- .../Tizen.Sensor/Plugins/SleepMonitor.cs | 2 +- .../Plugins/StationaryActivityDetector.cs | 2 +- .../Plugins/WalkingActivityDetector.cs | 2 +- src/Tizen.System/Device/Battery.cs | 6 - src/Tizen.System/Device/Led.cs | 2 - src/Tizen.Tracer/Tizen/Tracer.cs | 6 +- src/Tizen.WebView/Tizen.WebView/Chromium.cs | 7 +- src/Tizen.WebView/Tizen.WebView/Context.cs | 22 ++- src/Tizen.WebView/Tizen.WebView/CookieManager.cs | 34 ++-- src/Tizen.WebView/Tizen.WebView/Settings.cs | 3 + .../Tizen.WebView/SmartCallbackLoadErrorArgs.cs | 12 +- 70 files changed, 852 insertions(+), 511 deletions(-) create mode 100644 src/ElmSharp.Wearable/ElmSharp.Wearable/RotaryEventManager.cs mode change 100755 => 100644 src/ElmSharp/ElmSharp/GenGrid.cs mode change 100755 => 100644 src/ElmSharp/ElmSharp/GenItem.cs mode change 100755 => 100644 src/ElmSharp/ElmSharp/SmartEvent.cs create mode 100644 src/Tizen.Pims.Calendar/Tizen.Pims.Calendar/DBChangedEventArgs.cs diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec index 6cf322c..d5c9e9b 100644 --- a/packaging/csapi-tizenfx.spec +++ b/packaging/csapi-tizenfx.spec @@ -10,7 +10,7 @@ Name: csapi-tizenfx Summary: Assemblies of Tizen .NET -Version: 4.0.0.184 +Version: 4.0.0.194 Release: 1 Group: Development/Libraries License: Apache-2.0 diff --git a/pkg/PlatformFileList.txt b/pkg/PlatformFileList.txt index cee39bb..5026b09 100644 --- a/pkg/PlatformFileList.txt +++ b/pkg/PlatformFileList.txt @@ -69,7 +69,7 @@ Tizen.Sensor.dll #common #mobile #mobile-emul Tizen.System.dll #common #mobile #mobile-emul #tv #ivi #wearable Tizen.System.Feedback.dll #common #mobile #mobile-emul #tv #ivi #wearable Tizen.System.Information.dll #common #mobile #mobile-emul #tv #ivi #wearable -Tizen.System.MediaKey.dll #common #mobile #mobile-emul #ivi #wearable +Tizen.System.MediaKey.dll #common #mobile #mobile-emul #tv #ivi #wearable Tizen.System.PlatformConfig.dll #common #mobile #mobile-emul #tv #ivi #wearable Tizen.System.Storage.dll #common #mobile #mobile-emul #tv #ivi #wearable Tizen.System.SystemSettings.dll #common #mobile #mobile-emul #tv #ivi #wearable diff --git a/src/ElmSharp.Wearable/ElmSharp.Wearable/RotaryEventManager.cs b/src/ElmSharp.Wearable/ElmSharp.Wearable/RotaryEventManager.cs new file mode 100644 index 0000000..d7fb66b --- /dev/null +++ b/src/ElmSharp.Wearable/ElmSharp.Wearable/RotaryEventManager.cs @@ -0,0 +1,174 @@ +using System; +using System.Collections.Generic; +using System.Runtime.InteropServices; +using System.Text; + +namespace ElmSharp.Wearable +{ + /// + /// RotaryEventManager serve functions for global Rotary event like Galaxy Gear. + /// + public static class RotaryEventManager + { + static Dictionary s_rotaryEventHandlers = new Dictionary(); + + /// + /// Rotated will triggered when rotatable device like Galaxy Gear Bezel is rotated. + /// + public static event RotaryEventHandler Rotated + { + add + { + if (s_rotaryEventHandlers.ContainsKey(value)) return; + + Interop.Eext.Eext_Rotary_Handler_Cb cb = (data, infoPtr) => + { + var info = Interop.Eext.FromIntPtr(infoPtr); + value.Invoke(new RotaryEventArgs + { + IsClockwise = info.Direction == Interop.Eext.Eext_Rotary_Event_Direction.Clockwise, + Timestamp = info.TimeStamp + }); + return true; + }; + Interop.Eext.eext_rotary_event_handler_add(cb, IntPtr.Zero); + s_rotaryEventHandlers[value] = cb; + } + + remove + { + Interop.Eext.Eext_Rotary_Handler_Cb cb; + if (s_rotaryEventHandlers.TryGetValue(value, out cb)) + { + Interop.Eext.eext_rotary_event_handler_del(cb); + s_rotaryEventHandlers.Remove(value); + } + } + } + } + + + /// + /// RotaryEventManager serve extension functions for Rotary event to EvasObject on device like Galaxy Gear. + /// + public static class EvasObjectExtensions + { + static Dictionary s_rotaryObjectEventHandlers = new Dictionary(); + static Dictionary s_rotaryObjectEventMap = new Dictionary(); + + /// + /// Add a handler for Rotary event on specific EvasObject. + /// + /// Target EvasObject + /// Event handler for Rotary event + public static void AddRotaryEventHandler(this EvasObject obj, RotaryEventHandler handler) + { + EnableRotaryEventHandler(obj); + + if (s_rotaryObjectEventHandlers.ContainsKey(obj)) + { + s_rotaryObjectEventHandlers[obj] += handler; + } + else + { + s_rotaryObjectEventHandlers[obj] = handler; + } + } + + /// + /// Remove a handler on specific EvasObject for Rotary event. + /// + /// Target EvasObject + /// Event handler for Rotary event + public static void RemoveRotaryEventHandler(this EvasObject obj, RotaryEventHandler handler) + { + if (s_rotaryObjectEventHandlers.ContainsKey(obj)) + { + s_rotaryObjectEventHandlers[obj] -= handler; + if (s_rotaryObjectEventHandlers[obj] == null) + { + DisableRotaryEventHandler(obj, false); + s_rotaryObjectEventHandlers.Remove(obj); + } + } + } + + /// + /// Activate this object can take Rotary event. + /// + /// Target object + public static void Activate(this EvasObject obj) + { + Interop.Eext.eext_rotary_object_event_activated_set(obj, true); + } + + /// + /// Deactivate this object is blocked from Rotary event. + /// + /// Target object + public static void Deactivate(this EvasObject obj) + { + Interop.Eext.eext_rotary_object_event_activated_set(obj, false); + } + + static void EnableRotaryEventHandler(EvasObject obj) + { + if (!s_rotaryObjectEventMap.ContainsKey(obj)) + { + Interop.Eext.Eext_Rotary_Event_Cb cb = (d, o, i) => + { + RotaryEventHandler events; + if (s_rotaryObjectEventHandlers.TryGetValue(obj, out events)) + { + var info = Interop.Eext.FromIntPtr(i); + events?.Invoke(new RotaryEventArgs + { + IsClockwise = info.Direction == Interop.Eext.Eext_Rotary_Event_Direction.Clockwise, + Timestamp = info.TimeStamp + }); + } + return true; + }; + Interop.Eext.eext_rotary_object_event_callback_add(obj, cb, IntPtr.Zero); + s_rotaryObjectEventMap[obj] = cb; + obj.Deleted += (s, e) => DisableRotaryEventHandler(obj, true); + } + } + + static void DisableRotaryEventHandler(EvasObject obj, bool removeHandler) + { + Interop.Eext.Eext_Rotary_Event_Cb cb; + if (s_rotaryObjectEventMap.TryGetValue(obj, out cb)) + { + Interop.Eext.eext_rotary_object_event_callback_del(obj, cb); + s_rotaryObjectEventMap.Remove(obj); + } + if (removeHandler && s_rotaryObjectEventHandlers.ContainsKey(obj)) + { + s_rotaryObjectEventHandlers.Remove(obj); + } + } + } + + /// + /// Handler for Rotary event + /// + /// Rotary event information + public delegate void RotaryEventHandler(RotaryEventArgs args); + + /// + /// RotaryEventArgs serve information for triggered rotary event. + /// + public class RotaryEventArgs : EventArgs + { + /// + /// IsClockwise is true when Rotary device rotated clockwise direction or false on counter clockwise. + /// + public bool IsClockwise { get; set; } + + /// + /// Timestamp of rotary event + /// + public uint Timestamp { get; set; } + } +} diff --git a/src/ElmSharp.Wearable/Interop/Interop.Eext.Rotary.cs b/src/ElmSharp.Wearable/Interop/Interop.Eext.Rotary.cs index 5348d39..619077d 100644 --- a/src/ElmSharp.Wearable/Interop/Interop.Eext.Rotary.cs +++ b/src/ElmSharp.Wearable/Interop/Interop.Eext.Rotary.cs @@ -19,10 +19,49 @@ using System.Runtime.InteropServices; internal static partial class Interop { - internal static partial class Eext { + const short EEXT_CALLBACK_PRIORITY_AFTER = 100; + const short EEXT_CALLBACK_PRIORITY_BEFORE = -100; + const short EEXT_CALLBACK_PRIORITY_DEFAULT = 0; + + internal delegate bool Eext_Rotary_Event_Cb(IntPtr data, IntPtr obj, IntPtr info); + internal delegate bool Eext_Rotary_Handler_Cb(IntPtr data, IntPtr info); + + internal enum Eext_Rotary_Event_Direction + { + Clockwise, + CounterClockwise + } + + internal struct Eext_Rotary_Event_Info + { + public Eext_Rotary_Event_Direction Direction; + public uint TimeStamp; + } + + internal static Eext_Rotary_Event_Info FromIntPtr(IntPtr infoPtr) + { + var info = Marshal.PtrToStructure(infoPtr); + return info; + } + [DllImport(Libraries.Eext)] internal static extern IntPtr eext_rotary_object_event_activated_set(IntPtr circleObject, bool activated); + + [DllImport(Libraries.Eext)] + internal static extern bool eext_rotary_object_event_callback_add(IntPtr obj, Eext_Rotary_Event_Cb func, IntPtr data); + + [DllImport(Libraries.Eext)] + internal static extern bool eext_rotary_object_event_callback_priority_add(IntPtr obj, short priority, Eext_Rotary_Event_Cb func, IntPtr data); + + [DllImport(Libraries.Eext)] + internal static extern IntPtr eext_rotary_object_event_callback_del(IntPtr obj, Eext_Rotary_Event_Cb func); + + [DllImport(Libraries.Eext)] + internal static extern bool eext_rotary_event_handler_add(Eext_Rotary_Handler_Cb func, IntPtr data); + + [DllImport(Libraries.Eext)] + internal static extern IntPtr eext_rotary_event_handler_del(Eext_Rotary_Handler_Cb func); } } \ No newline at end of file diff --git a/src/ElmSharp/ElmSharp/EvasKeyEventArgs.cs b/src/ElmSharp/ElmSharp/EvasKeyEventArgs.cs index 8955904..378a7e9 100644 --- a/src/ElmSharp/ElmSharp/EvasKeyEventArgs.cs +++ b/src/ElmSharp/ElmSharp/EvasKeyEventArgs.cs @@ -26,8 +26,6 @@ namespace ElmSharp { IntPtr _nativeEventInfo; - EvasEventFlag _eventFlags; - /// /// BackButton name in Platform /// diff --git a/src/ElmSharp/ElmSharp/EvasMap.cs b/src/ElmSharp/ElmSharp/EvasMap.cs index cdf1410..13fa2ee 100755 --- a/src/ElmSharp/ElmSharp/EvasMap.cs +++ b/src/ElmSharp/ElmSharp/EvasMap.cs @@ -123,7 +123,7 @@ namespace ElmSharp /// The amount of degrees from 0.0 to 360.0 to rotate around Z axis /// The rotation's center horizontal position /// The rotation's center vertical position - /// The rotation's center vertical position + /// The rotation's center depth position public void Rotate3D(double dx, double dy, double dz, int cx, int cy, int cz) { Interop.Evas.evas_map_util_3d_rotate(_evasMap, dx, dy, dz, cx, cy, cz); diff --git a/src/ElmSharp/ElmSharp/GenGrid.cs b/src/ElmSharp/ElmSharp/GenGrid.cs old mode 100755 new mode 100644 index fc1f3fc..9616008 --- a/src/ElmSharp/ElmSharp/GenGrid.cs +++ b/src/ElmSharp/ElmSharp/GenGrid.cs @@ -242,7 +242,7 @@ namespace ElmSharp } /// - /// Gets or sets the gengrid select mode by . + /// Gets or sets the gengrid select mode by . /// public GenItemSelectionMode SelectionMode { diff --git a/src/ElmSharp/ElmSharp/GenItem.cs b/src/ElmSharp/ElmSharp/GenItem.cs old mode 100755 new mode 100644 index 90b3325..ca50c53 --- a/src/ElmSharp/ElmSharp/GenItem.cs +++ b/src/ElmSharp/ElmSharp/GenItem.cs @@ -71,9 +71,6 @@ namespace ElmSharp /// public GenItemClass ItemClass { get; protected set; } - /// - /// It's a abstract property. It's implemented by and . - /// public GetTooltipContentDelegate TooltipContentDelegate { get @@ -87,6 +84,9 @@ namespace ElmSharp } } + /// + /// It's a abstract property. + /// public abstract GenItemSelectionMode SelectionMode { get; set; } public abstract string Cursor { get; set; } @@ -129,4 +129,4 @@ namespace ElmSharp protected abstract void UpdateTooltipDelegate(); } -} \ No newline at end of file +} diff --git a/src/ElmSharp/ElmSharp/SmartEvent.cs b/src/ElmSharp/ElmSharp/SmartEvent.cs old mode 100755 new mode 100644 index 6edbb7a..f413f82 --- a/src/ElmSharp/ElmSharp/SmartEvent.cs +++ b/src/ElmSharp/ElmSharp/SmartEvent.cs @@ -161,7 +161,6 @@ namespace ElmSharp /// This way, you can extend EvasObject's own . /// They are defined by an event string, which identifies them uniquely. /// - /// The parameter for the event. public class SmartEvent : IInvalidatable { private SmartEvent _smartEvent; diff --git a/src/ElmSharp/ElmSharp/Toolbar.cs b/src/ElmSharp/ElmSharp/Toolbar.cs index 0370594..644a43c 100644 --- a/src/ElmSharp/ElmSharp/Toolbar.cs +++ b/src/ElmSharp/ElmSharp/Toolbar.cs @@ -394,7 +394,6 @@ namespace ElmSharp /// The label of the item /// A string with the icon name or the absolute path of an image file /// The new which insert into the toolbar - /// public ToolbarItem InsertAfter(ToolbarItem after, string label, string icon) { ToolbarItem item = new ToolbarItem(label, icon); diff --git a/src/Tizen.Account.SyncManager/Interop/Interop.Libraries.cs b/src/Tizen.Account.SyncManager/Interop/Interop.Libraries.cs index 837e50b..a1d3410 100755 --- a/src/Tizen.Account.SyncManager/Interop/Interop.Libraries.cs +++ b/src/Tizen.Account.SyncManager/Interop/Interop.Libraries.cs @@ -17,7 +17,7 @@ internal static partial class Interop { /// - /// Wrapper class for maintaining names of dependent native libraries. + /// The Wrapper class for maintaining names of dependent native libraries. /// internal static partial class Libraries { diff --git a/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/Enumerations.cs b/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/Enumerations.cs index 4befba6..7bfb265 100755 --- a/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/Enumerations.cs +++ b/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/Enumerations.cs @@ -19,64 +19,64 @@ using System; namespace Tizen.Account.SyncManager { /// - /// Enumeration for the Sync option + /// Enumeration for the sync option. /// [Flags] public enum SyncOption { /// - /// Sync job will be operated normally + /// The sync job will be operated normally. /// None = 0, /// - /// Sync job will be operated as soon as possible + /// The sync job will be operated as soon as possible. /// Expedited = 0X01, /// - /// Sync job will not be performed again when it fails + /// The sync job will not be performed again when it fails. /// NoRetry = 0X02, } /// - /// Enumeration for the Sync period + /// Enumeration for the sync period. /// public enum SyncPeriod { /// - /// Sync within 30 minutes + /// Sync within 30 minutes. /// ThirtyMin = 0, /// - /// Sync within 1 hour + /// Sync within 1 hour. /// OneHour, /// - /// Sync within 2 hours + /// Sync within 2 hours. /// TwoHours, /// - /// Sync within 3 hours + /// Sync within 3 hours. /// ThreeHours, /// - /// Sync within 6 hours + /// Sync within 6 hours. /// SixHours, /// - /// Sync within 12 hours + /// Sync within 12 hours. /// TwelveHours, /// - /// Sync within 1 day + /// Sync within 1 day. /// OneDay, } diff --git a/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/SyncAdapter.cs b/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/SyncAdapter.cs index 8a59593..4a25dee 100755 --- a/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/SyncAdapter.cs +++ b/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/SyncAdapter.cs @@ -21,7 +21,7 @@ using Tizen.Account.AccountManager; namespace Tizen.Account.SyncManager { /// - /// The class contains the delegates to be called upon scheduling a sync operation + /// This class contains the delegates to be called upon scheduling a sync operation. /// public class SyncAdapter { @@ -29,23 +29,23 @@ namespace Tizen.Account.SyncManager Interop.Adapter.SyncAdapterCancelSyncCallback _cancelSyncCallback; /// - /// Callback function for Sync Adapter's start sync request + /// The callback function for the sync adapter's start sync request. /// /// The sync job parameters corresponding to the sync request. - /// true if sync operation is success, @c false otherwise. + /// true if the sync operation is success, @c false otherwise. public delegate bool StartSyncCallback(SyncJobData syncParameters); /// - /// Callback function for Sync Adapter's cancel sync request. + /// The callback function for the sync adapter's cancel sync request. /// /// The sync job parameters corresponding to the sync request. public delegate void CancelSyncCallback(SyncJobData syncParameters); /// - /// Sets client (Sync Adapter) callback functions + /// Sets the client (sync adapter) callback functions. /// - /// A callback function to be called by Sync Manager for performing sync operation. - /// A callback function to be called by Sync Manager for cancelling sync operation. + /// A callback function to be called by the sync manager for performing the sync operation. + /// A callback function to be called by the sync manager for cancelling the sync operation. /// Thrown when any of the arguments are null. /// Thrown when the application calling this API cannot be a sync adapter. public void SetSyncEventCallbacks(StartSyncCallback startSyncCb, CancelSyncCallback cancelSyncCb) @@ -98,7 +98,7 @@ namespace Tizen.Account.SyncManager } /// - /// Unsets client (Sync Adapter) callback functions + /// Unsets the client (sync adapter) callback functions. /// /// Thrown when sync manager internal error occurs. public void UnsetSyncEventCallbacks() diff --git a/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/SyncClient.cs b/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/SyncClient.cs index 4c82b85..f86747b 100755 --- a/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/SyncClient.cs +++ b/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/SyncClient.cs @@ -23,25 +23,25 @@ namespace Tizen.Account.SyncManager { /// /// The SyncClient APIs for managing the sync operations. Applications will call these APIs to schedule their sync operations. - /// Sync service maintains sync requests from all the applications and invokes their respective callback methods to perform account synchronization operations. + /// The sync service maintains sync requests from all the applications and invokes their respective callback methods to perform account synchronization operations. /// public static class SyncClient { /// - /// The constructor + /// The constructor. /// static SyncClient() { } /// - /// Requests Sync Manager to perform one time sync operation + /// Requests the sync manager to perform one time sync operation. /// - /// Sync job information of the sync job request. - /// sync options determine an way to operate sync job and can be used as ORing. + /// The sync job information of the sync job request. + /// Sync options determine a way to operate the sync job and can be used as ORing. /// Thrown when any of the arugments are null. - /// Thrown when the application calling this api doesn't have a sync adapter. - /// A unique value which can manage sync jobs. The number of sync job id is limited as less than a hundred. + /// Thrown when the application calling this API doesn't have a sync adapter. + /// An unique value which can manage sync jobs. The number of sync job ID is limite as it is less than hundred. public static int RequestOnDemandSyncJob(SyncJobData request, SyncOption syncOptions) { if (request == null || request.SyncJobName == null) @@ -63,16 +63,16 @@ namespace Tizen.Account.SyncManager } /// - /// Requests Sync Manager to perform periodic sync operations + /// Requests the sync manager to perform periodic sync operations. /// - /// Sync job information of the sync job request. - /// Determines time interval of periodic sync. The periodic sync operation can be triggered in that interval, but it does not guarantee exact time. The minimum value is 30 minutes. - /// sync options determine an way to operate sync job and can be used as ORing. + /// The sync job information of the sync job request. + /// Determines the time interval of the periodic sync. The periodic sync operation can be triggered in that interval, but it does not guarantee the exact time. The minimum value is 30 minutes. + /// Sync options determine a way to operate the sync job and can be used as ORing. /// http://tizen.org/privilege/alarm.set - /// In case of privilege not defined. + /// In case of a privilege not defined. /// Thrown when any of the arguments are null. /// Thrown when the application calling this API doesn't have a sync adapter. - /// A unique value which can manage sync jobs. The number of sync job id is limited as less than a hundred. + /// A unique value which can manage sync jobs. The number of sync job IDs is limited as it is less than hundred. public static int AddPeriodicSyncJob(SyncJobData request, SyncPeriod period, SyncOption syncOptions) { if (request == null || request.SyncJobName == null) @@ -94,16 +94,16 @@ namespace Tizen.Account.SyncManager } /// - /// Requests Sync Manager to perform sync operations whenever corresponding DB changed + /// Requests the sync manager to perform sync operations whenever the corresponding DB is changed. /// - /// Sync job information of the sync job request. - /// sync options determine an way to operate sync job and can be used as ORing. + /// The sync job information of the sync job request. + /// Sync options determine a way to operate the sync job and can be used as ORing. /// http://tizen.org/privilege/calendar.read /// http://tizen.org/privilege/contact.read - /// In case of privilege not defined. + /// In case of a privilege is not defined. /// Thrown when any of the arguments are null. /// Thrown when the application calling this API doesn't have a sync adapter. - /// A unique value which can manage sync jobs. The number of sync job id is limited as less than a hundred. + /// A unique value which can manage sync jobs. The number of sync job IDs is limited as it is less than hundred. public static int AddDataChangeSyncJob(SyncJobData request, SyncOption syncOptions) { if (request == null || request.SyncJobName == null) @@ -125,7 +125,7 @@ namespace Tizen.Account.SyncManager } /// - /// Get all the sync jobs registered with the sync manager + /// Gets all the sync jobs registered with the sync manager. /// /// /// Returns the list of SyncJobData corresponding to sync requests. @@ -160,9 +160,9 @@ namespace Tizen.Account.SyncManager } /// - /// Requests Sync Manager to remove corresponding sync job job based on id + /// Requests the sync manager to remove the corresponding sync job based on the ID. /// - /// A unique value of each sync job, it can be used to search specific sync job and remove it. + /// A unique value of each sync job, it can be used to search a specific sync job and remove it. /// Thrown if the input arugments is invalid. public static void RemoveSyncJob(int id) { diff --git a/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/SyncJobData.cs b/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/SyncJobData.cs index 51c2039..e9f88da 100755 --- a/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/SyncJobData.cs +++ b/src/Tizen.Account.SyncManager/Tizen.Account.SyncManager/SyncJobData.cs @@ -20,70 +20,70 @@ using Tizen.Account.AccountManager; namespace Tizen.Account.SyncManager { /// - /// Class represents information about a sync job request + /// This class represents information about the sync job request. /// public class SyncJobData { /// - /// Represents calendar capability + /// Represents the calendar capability. /// /// - /// If you want to receive notification about calendar database change, assign it to SyncJobName property of SyncJobData object. + /// If you want to receive notification about the calendar database change, assign it to the SyncJobName property of the SyncJobData object. /// public const string CalendarCapability = "http://tizen.org/sync/capability/calendar"; /// - /// Represents contact capability + /// Represents the contact capability. /// /// - /// If you want to receive notification about contact database change, assign it to SyncJobName property of SyncJobData object. + /// If you want to receive notification about the contact database change, assign it to the SyncJobName property of the SyncJobData object. /// public const string ContactCapability = "http://tizen.org/sync/capability/contact"; /// - /// Represents image capability + /// Represents the image capability. /// /// - /// If you want to receive notification about image database change, assign it to SyncJobName property of SyncJobData object. + /// If you want to receive notification about the image database change, assign it to the SyncJobName property of the SyncJobData object. /// public const string ImageCapability = "http://tizen.org/sync/capability/image"; /// - /// Represents video capability + /// Represents the video capability. /// /// - /// If you want to receive notification about video database change, assign it to SyncJobName property of SyncJobData object. + /// If you want to receive notification about the video database change, assign it to the SyncJobName property of the SyncJobData object. /// public const string VideoCapability = "http://tizen.org/sync/capability/video"; /// - /// Represents sound capability + /// Represents the sound capability. /// /// - /// If you want to receive notification about sound database change, assign it to SyncJobName property of SyncJobData object. + /// If you want to receive notification about the sound database change, assign it to the SyncJobName property of the SyncJobData object. /// public const string SoundCapability = "http://tizen.org/sync/capability/sound"; /// - /// Represents music capability + /// Represents the music capability. /// /// - /// If you want to receive notification about music database change, assign it to SyncJobName property of SyncJobData object. + /// If you want to receive notification about the music database change, assign it to the SyncJobName property of the SyncJobData object. /// public const string MusicCapability = "http://tizen.org/sync/capability/music"; /// - /// The account instance on which sync operation was requested or @c null in the case of accountless sync operation + /// The account instance on which the sync operation was requested or @c null in the case of the accountless sync operation. /// public AccountManager.Account Account { get; set; } /// - /// User data which contains additional information related registered sync job + /// User data which contains an additional information related to the registered sync job. /// public Bundle UserData { get; set; } /// - /// A string representing a sync job which has been operated or capability setting to operate data change sync job + /// A string representing a sync job which has been operated or capability setting to operate the data change sync job. /// public string SyncJobName { get; set; } } diff --git a/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/HomeShortcutAddedInfo.cs b/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/HomeShortcutAddedInfo.cs index d421fd3..91038a1 100755 --- a/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/HomeShortcutAddedInfo.cs +++ b/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/HomeShortcutAddedInfo.cs @@ -24,11 +24,11 @@ namespace Tizen.Applications.Shortcut /// /// Gets the name of application. /// - public string AppId { get; internal set; } = string.Empty; + public string AppId { get; internal set; } /// /// Gets the specific information for creating a new shortcut. /// - public string Uri { get; internal set; } = string.Empty; + public string Uri { get; internal set; } } } \ No newline at end of file diff --git a/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/ShortcutAddedInfo.cs b/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/ShortcutAddedInfo.cs index 9a0756a..889e3cb 100755 --- a/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/ShortcutAddedInfo.cs +++ b/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/ShortcutAddedInfo.cs @@ -24,12 +24,12 @@ namespace Tizen.Applications.Shortcut /// /// Gets the name of the created shortcut icon. /// - public string ShortcutName { get; internal set; } = string.Empty; + public string ShortcutName { get; internal set; } /// /// Gets the absolute path of an icon file for this shortcut. /// - public string IconPath { get; internal set; } = string.Empty; + public string IconPath { get; internal set; } /// /// Gets a value indicating whether to allow or not to allow duplication. diff --git a/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/ShortcutDeletedInfo.cs b/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/ShortcutDeletedInfo.cs index 6164dcb..73786f9 100755 --- a/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/ShortcutDeletedInfo.cs +++ b/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/ShortcutDeletedInfo.cs @@ -24,11 +24,11 @@ namespace Tizen.Applications.Shortcut /// /// Gets the name of package. /// - public string AppId { get; internal set; } = string.Empty; + public string AppId { get; internal set; } /// /// Gets the name of the created shortcut icon. /// - public string ShortcutName { get; internal set; } = string.Empty; + public string ShortcutName { get; internal set; } } } \ No newline at end of file diff --git a/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/ShortcutTemplate.cs b/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/ShortcutTemplate.cs index 73b8167..05fcb99 100755 --- a/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/ShortcutTemplate.cs +++ b/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/ShortcutTemplate.cs @@ -24,26 +24,26 @@ namespace Tizen.Applications.Shortcut /// /// Gets the Application ID. /// - public string AppId { get; internal set; } = string.Empty; + public string AppId { get; internal set; } /// /// Gets the name of the created shortcut icon. /// - public string ShortcutName { get; internal set; } = string.Empty; + public string ShortcutName { get; internal set; } /// /// Gets the absolute path of an icon file for this shortcut. /// - public string IconPath { get; internal set; } = string.Empty; + public string IconPath { get; internal set; } /// /// Gets the user data. A property of shortcut element in manifest file. /// - public string ExtraKey { get; internal set; } = string.Empty; + public string ExtraKey { get; internal set; } /// /// Gets the user data. A property of shortcut element in manifest file. /// - public string ExtraData { get; internal set; } = string.Empty; + public string ExtraData { get; internal set; } } } \ No newline at end of file diff --git a/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/WidgetShortcutAddedInfo.cs b/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/WidgetShortcutAddedInfo.cs index b0b5a6c..eed1e4f 100755 --- a/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/WidgetShortcutAddedInfo.cs +++ b/src/Tizen.Applications.Shortcut/Tizen.Applications.ShortcutEvent/WidgetShortcutAddedInfo.cs @@ -24,7 +24,7 @@ namespace Tizen.Applications.Shortcut /// /// Gets the Widget ID. /// - public string WidgetId { get; internal set; } = string.Empty; + public string WidgetId { get; internal set; } /// /// Gets the size of widget. diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaDatabase.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaDatabase.cs index c8676f7..8474364 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaDatabase.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaDatabase.cs @@ -356,10 +356,9 @@ namespace Tizen.Content.MediaContent { var tcs = new TaskCompletionSource(); - using (var cbKeeper = ObjectKeeper.Get(GetScanCompletedCallback(tcs))) + using (var cbKeeper = ObjectKeeper.Get(GetScanCompletedCallback(tcs, cancellationToken))) using (RegisterCancellationAction(tcs, folderPath, cancellationToken)) { - Interop.Content.ScanFolder(folderPath, recursive, cbKeeper.Target) .ThrowIfError("Failed to scan"); @@ -367,13 +366,21 @@ namespace Tizen.Content.MediaContent } } - private static Interop.Content.MediaScanCompletedCallback GetScanCompletedCallback(TaskCompletionSource tcs) + private static Interop.Content.MediaScanCompletedCallback GetScanCompletedCallback(TaskCompletionSource tcs, + CancellationToken cancellationToken) { return (scanResult, _) => { if (scanResult == MediaContentError.None) { - tcs.TrySetResult(true); + if (cancellationToken.IsCancellationRequested) + { + tcs.TrySetCanceled(); + } + else + { + tcs.TrySetResult(true); + } } else { @@ -398,7 +405,6 @@ namespace Tizen.Content.MediaContent } Interop.Content.CancelScanFolder(folderPath).ThrowIfError("Failed to cancel scanning"); - tcs.TrySetCanceled(); }); } diff --git a/src/Tizen.Location/Tizen.Location/GpsSatellite.cs b/src/Tizen.Location/Tizen.Location/GpsSatellite.cs index d870c96..d2c35aa 100755 --- a/src/Tizen.Location/Tizen.Location/GpsSatellite.cs +++ b/src/Tizen.Location/Tizen.Location/GpsSatellite.cs @@ -68,7 +68,7 @@ namespace Tizen.Location /// 3 /// Thrown when the operation is invalid for the current state. /// Thrown when an invalid argument is used. - /// Thrown when the application has no privilege to use the location. + /// Thrown when the application has no privilege to use the location. /// Thrown when the location is not supported. public string Nmea { @@ -100,7 +100,7 @@ namespace Tizen.Location /// http://tizen.org/privilege/location /// Thrown when the operation is invalid for the current state. /// Thrown when an invalid argument is used. - /// Thrown when the application has no privilege to use the location. + /// Thrown when the application has no privilege to use the location. /// Thrown when the location is not supported. public int ActiveCount { @@ -132,7 +132,7 @@ namespace Tizen.Location /// http://tizen.org/privilege/location /// Thrown when the operation is invalid for the current state. /// Thrown when an invalid argument is used. - /// Thrown when the application has no privilege to use the location. + /// Thrown when the application has no privilege to use the location. /// Thrown when the location is not supported. public int InViewCount { @@ -164,7 +164,7 @@ namespace Tizen.Location /// http://tizen.org/privilege/location /// Thrown when the operation is invalid for the current state. /// Thrown when an invalid argument is used. - /// Thrown when the application has no privilege to use the location. + /// Thrown when the application has no privilege to use the location. /// Thrown when the location is not supported. public IList Satellites { @@ -233,7 +233,7 @@ namespace Tizen.Location /// 3 /// http://tizen.org/privilege/location /// Thrown when an invalid argument is used. - /// Thrown when the application has no privilege to use the location. + /// Thrown when the application has no privilege to use the location. /// Thrown when the location is not supported. public event EventHandler SatelliteStatusUpdated { @@ -327,21 +327,18 @@ namespace Tizen.Location /// The azimuth information of the satellite. /// /// 3 - /// The azimuth value of the satellite in degrees. public uint Azimuth { get; private set; } /// /// The elevation information of the satellite. /// /// 3 - /// The azimuth value of the satellite in degrees. public uint Elevation { get; private set; } /// /// The PRN of the satellite. /// /// 3 - /// The azimuth value of the satellite in degrees. public uint Prn { get; private set; } /// diff --git a/src/Tizen.Location/Tizen.Location/Locator.cs b/src/Tizen.Location/Tizen.Location/Locator.cs index 137e161..9a72fff 100755 --- a/src/Tizen.Location/Tizen.Location/Locator.cs +++ b/src/Tizen.Location/Tizen.Location/Locator.cs @@ -266,7 +266,7 @@ namespace Tizen.Location /// /// 3 /// http://tizen.org/privilege/location - /// Thrown when the application has no privilege to use the location. + /// Thrown when the application has no privilege to use the location. /// Thrown when the location is not supported. public bool EnableMock { @@ -317,7 +317,7 @@ namespace Tizen.Location /// http://tizen.org/privilege/location /// Thrown when the operation is invalid for the current state. /// Thrown when an invalid argument is used. - /// Thrown when the application has no privilege to use the location. + /// Thrown when the application has no privilege to use the location. /// Thrown when the location is not supported. public void Start() { @@ -371,7 +371,7 @@ namespace Tizen.Location /// http://tizen.org/privilege/location /// Thrown when the operation is invalid for the current state. /// Thrown when an invalid argument is used. - /// Thrown when the application has no privilege to use the location. + /// Thrown when the application has no privilege to use the location. /// Thrown when the location is not supported. public void SetMockLocation(Location location) { @@ -400,7 +400,7 @@ namespace Tizen.Location /// http://tizen.org/privilege/location /// Thrown when the operation is invalid for the current state. /// Thrown when an invalid argument is used. - /// Thrown when the application has no privilege to use the location. + /// Thrown when the application has no privilege to use the location. /// Thrown when the location is not supported. public void ClearMock() { @@ -422,7 +422,7 @@ namespace Tizen.Location /// http://tizen.org/privilege/location /// Thrown when the operation is invalid for the current state. /// Thrown when an invalid argument is used. - /// Thrown when the application has no privilege to use the location. + /// Thrown when the application has no privilege to use the location. /// Thrown when the location is not supported. public Task GetLocationAsync(int timeout) { @@ -468,7 +468,7 @@ namespace Tizen.Location /// http://tizen.org/privilege/location /// Thrown when the operation is invalid for the current state. /// Thrown when an invalid argument is used. - /// Thrown when the application has no privilege to use the location. + /// Thrown when the application has no privilege to use the location. /// Thrown when the location is not supported. public Location GetLocation() { diff --git a/src/Tizen.Location/Tizen.Location/SettingChangedEventArgs.cs b/src/Tizen.Location/Tizen.Location/SettingChangedEventArgs.cs index c191ce3..36e8c93 100755 --- a/src/Tizen.Location/Tizen.Location/SettingChangedEventArgs.cs +++ b/src/Tizen.Location/Tizen.Location/SettingChangedEventArgs.cs @@ -24,7 +24,7 @@ namespace Tizen.Location /// The class constructor for the SettingChangedEventArgs class. /// /// 3 - /// The positioing method used for the location information. + /// The positioing method used for the location information. /// The status of the method. public SettingChangedEventArgs(LocationType type, bool enable) { diff --git a/src/Tizen.Multimedia.Camera/Camera/Camera.cs b/src/Tizen.Multimedia.Camera/Camera/Camera.cs index 4a1bf65..58477cf 100755 --- a/src/Tizen.Multimedia.Camera/Camera/Camera.cs +++ b/src/Tizen.Multimedia.Camera/Camera/Camera.cs @@ -33,10 +33,10 @@ namespace Tizen.Multimedia } /// - /// The camera class provides methods to capture photos and support setting up notifications - /// for state changes of capturing, previewing, focusing, information about resolution and binary format - /// and functions for picture manipulations like sepia negative and many more. - /// It also notifies you when a significant picture parameter changes e.g. focus. + /// This camera class provides methods to capture photos and supports setting up notifications + /// for state changes of capturing, previewing, focusing, and informing about the resolution and the binary format, + /// and functions for picture manipulations like sepia, negative, and many more. + /// It also notifies you when a significant picture parameter changes, (For example, focus). /// public class Camera : IDisposable, IDisplayable { @@ -45,10 +45,10 @@ namespace Tizen.Multimedia private CameraState _state = CameraState.None; /// - /// Initializes a new instance of the Class. + /// Initializes a new instance of the class. /// /// 3 - /// The camera device to access + /// The camera device to access. public Camera(CameraDevice device) { CameraErrorFactory.ThrowIfError(Native.Create(device, out _handle), @@ -81,7 +81,7 @@ namespace Tizen.Multimedia #region Dispose support /// - /// Releases the unmanaged resources used by the Camera. + /// Releases the unmanaged resources used by the camera. /// /// true to release both managed and unmanaged resources; false to release only unmanaged resources. protected virtual void Dispose(bool disposing) @@ -104,7 +104,7 @@ namespace Tizen.Multimedia } /// - /// Releases all resources used by the Camera. + /// Releases all resources used by the camera. /// /// 3 public void Dispose() @@ -147,48 +147,48 @@ namespace Tizen.Multimedia #region EventHandlers /// - /// Event that occurs when the camera interrupt is started by policy. + /// An event that occurs when the camera interrupt is started by the policy. /// public event EventHandler InterruptStarted; private Native.InterruptStartedCallback _interruptStartedCallback; /// - /// Event that occurs when an camera is interrupted by policy. + /// An event that occurs when an camera is interrupted by the policy. /// /// 3 public event EventHandler Interrupted; private Native.InterruptedCallback _interruptedCallback; /// - /// Event that occurs when there is an asynchronous error. + /// An event that occurs when there is an asynchronous error. /// /// 3 public event EventHandler ErrorOccurred; private Native.ErrorCallback _errorCallback; /// - /// Event that occurs when the auto focus state is changed. + /// An event that occurs when the auto focus state is changed. /// /// 3 public event EventHandler FocusStateChanged; private Native.FocusStateChangedCallback _focusStateChangedCallback; /// - /// Event that occurs when a face is detected in preview frame. + /// An event that occurs when a face is detected in the preview frame. /// /// 3 public event EventHandler FaceDetected; private Native.FaceDetectedCallback _faceDetectedCallback; /// - /// Event that occurs during capture of image. + /// An event that occurs during capture of an image. /// /// 3 public event EventHandler Capturing; private Native.CapturingCallback _capturingCallback; /// - /// Event that occurs after the capture of the image. + /// An event that occurs after the capture of the image. /// /// 3 public event EventHandler CaptureCompleted; @@ -199,8 +199,8 @@ namespace Tizen.Multimedia private object _hdrCaptureProgressEventLock = new object(); /// - /// Event that occurs when there is change in HDR capture progress. - /// Check whether is supported or not before add this EventHandler. + /// An event that occurs when there is a change in the HDR capture progress. + /// Checks whether the is supported or not before adding this EventHandler. /// /// 3 /// In case of HDR feature is not supported. @@ -234,7 +234,7 @@ namespace Tizen.Multimedia } /// - /// Event that occurs when camera state is changed. + /// An event that occurs when the camera state is changed. /// /// 3 public event EventHandler StateChanged; @@ -246,7 +246,7 @@ namespace Tizen.Multimedia private static int _deviceStateCallbackId; /// - /// Event that occurs after the is changed. + /// An event that occurs after the is changed. /// /// 3 /// In case of any invalid operations. @@ -285,8 +285,8 @@ namespace Tizen.Multimedia private event EventHandler _preview; private object _previewEventLock = new object(); /// - /// Event that occurs once per frame when previewing. - /// Preview callback is registered when user add callback explicitly to avoid useless P/Invoke. + /// An event that occurs once per frame when previewing. + /// Preview callback is registered when an user adds a callback explicitly to avoid useless P/Invoke. /// /// 3 public event EventHandler Preview @@ -323,8 +323,8 @@ namespace Tizen.Multimedia private object _mediaPacketPreviewEventLock = new object(); /// - /// Event that occurs once per frame when previewing. - /// Preview callback is registered when user add callback explicitly to avoid useless P/Invoke. + /// An event that occurs once per frame when previewing. + /// Preview callback is registered when an user adds a callback explicitly to avoid useless P/Invoke. /// /// 3 public event EventHandler MediaPacketPreview @@ -359,7 +359,7 @@ namespace Tizen.Multimedia #region Properties /// - /// Get/Set the various camera settings. + /// Gets or sets the various camera settings. /// /// 3 public CameraSettings Settings { get; } @@ -401,12 +401,12 @@ namespace Tizen.Multimedia /// /// 3 /// - /// This must be set before StartPreview() method. - /// In Custom ROI display mode, DisplayRoiArea property must be set before calling this method. + /// This must be set before the StartPreview() method. + /// In custom ROI display mode, DisplayRoiArea property must be set before calling this method. /// /// In case of any invalid operations. /// In case of this feature is not supported. - /// The camera already has been disposed. + /// The camera already has been disposed of. /// In case of access to the resources cannot be granted. public Display Display { @@ -452,8 +452,8 @@ namespace Tizen.Multimedia /// Gets the state of the camera. /// /// 3 - /// None, Created, Preview, Capturing, Captured - /// The camera already has been disposed. + /// None, Created, Preview, Capturing, Captured. + /// The camera already has been disposed of. public CameraState State { get @@ -469,14 +469,14 @@ namespace Tizen.Multimedia } /// - /// The hint for display reuse. + /// The hint for the display reuse. /// If the hint is set to true, the display will be reused when the camera device is changed with - /// ChangeDevice method. + /// the ChangeDevice method. /// /// 3 /// In case of invalid parameters. - /// Invalid state. - /// The camera already has been disposed. + /// An invalid state. + /// The camera already has been disposed of. public bool DisplayReuseHint { get @@ -499,11 +499,11 @@ namespace Tizen.Multimedia } /// - /// Gets the facing direction of camera module. + /// Gets the facing direction of the camera module. /// /// 3 - /// A that specifies the facing direction of camera device. - /// The camera already has been disposed. + /// A that specifies the facing direction of the camera device. + /// The camera already has been disposed of. public CameraFacingDirection Direction { get @@ -523,7 +523,7 @@ namespace Tizen.Multimedia /// 3 /// This returns 2, if the device supports primary and secondary cameras. /// Otherwise 1, if the device only supports primary camera. - /// The camera already has been disposed. + /// The camera already has been disposed of. public int CameraCount { get @@ -552,8 +552,8 @@ namespace Tizen.Multimedia /// /// In case of invalid parameters. /// In case of any invalid operations. - /// In case of ChangeDevice feature is not supported. - /// The camera already has been disposed. + /// In case of the ChangeDevice feature is not supported. + /// The camera already has been disposed of. public void ChangeDevice(CameraDevice device) { ValidateState(CameraState.Created); @@ -567,8 +567,8 @@ namespace Tizen.Multimedia /// Gets the device state. /// /// 3 - /// The device to get state. - /// Returns the state of camera device + /// The device to get the state. + /// Returns the state of the camera device. /// In case of invalid parameters. /// In case of any invalid operations. /// In case of this feature is not supported. @@ -586,8 +586,8 @@ namespace Tizen.Multimedia /// Gets the flash state. /// /// 3 - /// The device to get state. - /// Returns the flash state of camera device + /// The device to get the state. + /// Returns the flash state of the camera device. /// In case of invalid parameters. /// In case of any invalid operations. /// In case of this feature is not supported. @@ -607,7 +607,7 @@ namespace Tizen.Multimedia /// If needed set fps , preview resolution /// , or preview format /// before using this method. - /// The camera must be in the or state. + /// The camera must be in the or the state. /// /// 3 /// @@ -615,7 +615,7 @@ namespace Tizen.Multimedia /// /// In case of any invalid operations. /// In case of this feature is not supported. - /// The camera already has been disposed. + /// The camera already has been disposed of. /// In case of access to the resources cannot be granted. public void StartPreview() { @@ -638,7 +638,7 @@ namespace Tizen.Multimedia /// /// In case of any invalid operations. /// In case of this feature is not supported. - /// The camera already has been disposed. + /// The camera already has been disposed of. /// In case of access to the resources cannot be granted. public void StopPreview() { @@ -661,13 +661,13 @@ namespace Tizen.Multimedia /// http://tizen.org/privilege/camera /// /// - /// This function causes the transition of the camera state from Capturing to Captured + /// This function causes the transition of the camera state from capturing to captured /// automatically and the corresponding EventHandlers will be invoked. - /// The preview should be restarted by calling method after capture is completed. + /// The preview should be restarted by calling the method after capture is completed. /// /// In case of any invalid operations. /// In case of this feature is not supported. - /// The camera already has been disposed. + /// The camera already has been disposed of. /// In case of access to the resources cannot be granted. public void StartCapture() { @@ -694,16 +694,16 @@ namespace Tizen.Multimedia /// The cancellation token to cancel capturing. /// /// - /// If this is not supported zero shutter lag occurs. The capture resolution could be + /// If this is not supported, zero shutter lag occurs. The capture resolution could be /// changed to the preview resolution. This function causes the transition of the camera state - /// from Capturing to Captured automatically and the corresponding Eventhandlers will be invoked. - /// Each captured image will be delivered through Eventhandler set using event. - /// The preview should be restarted by calling method after capture is completed. + /// from capturing to captured automatically and the corresponding Eventhandlers will be invoked. + /// Each captured image will be delivered through Eventhandler set using the event. + /// The preview should be restarted by calling the method after capture is completed. /// /// In case of invalid parameters. /// In case of any invalid operations. /// In case of this feature is not supported. - /// The camera already has been disposed. + /// The camera already has been disposed of. /// In case of access to the resources cannot be granted. public void StartCapture(int count, int interval, CancellationToken cancellationToken) { @@ -738,10 +738,10 @@ namespace Tizen.Multimedia /// /// Starts camera auto-focusing, asynchronously. - /// The camera must be in the or state. + /// The camera must be in the or the state. /// /// 3 - /// Continuous auto focus + /// Continuous auto focus. /// /// http://tizen.org/privilege/camera /// @@ -751,7 +751,7 @@ namespace Tizen.Multimedia /// In case of invalid parameters. /// In case of any invalid operations. /// In case of this feature is not supported. - /// The camera already has been disposed. + /// The camera already has been disposed of. /// In case of access to the resources cannot be granted. public void StartFocusing(bool continuous) { @@ -763,7 +763,7 @@ namespace Tizen.Multimedia /// /// Stops camera auto focusing. - /// The camera must be in the or state. + /// The camera must be in the or the state. /// /// 3 /// @@ -771,7 +771,7 @@ namespace Tizen.Multimedia /// /// In case of any invalid operations. /// In case of this feature is not supported. - /// The camera already has been disposed. + /// The camera already has been disposed of. /// In case of access to the resources cannot be granted. public void StopFocusing() { @@ -791,12 +791,12 @@ namespace Tizen.Multimedia /// /// /// This should be called after is started. - /// The Eventhandler set using invoked when the face is detected in preview frame. - /// Internally it starts continuous focus and focusing on the detected face. + /// The Eventhandler set using is invoked when the face is detected in the preview frame. + /// Internally, it starts continuously focus and focusing on the detected face. /// /// In case of any invalid operations. /// In case of this feature is not supported. - /// The camera already has been disposed. + /// The camera already has been disposed of. /// In case of access to the resources cannot be granted. public void StartFaceDetection() { @@ -828,7 +828,7 @@ namespace Tizen.Multimedia /// /// In case of any invalid operations. /// In case of this feature is not supported. - /// The camera already has been disposed. + /// The camera already has been disposed of. /// In case of access to the resources cannot be granted. public void StopFaceDetection() { diff --git a/src/Tizen.Multimedia.Camera/Camera/CameraCapabilities.cs b/src/Tizen.Multimedia.Camera/Camera/CameraCapabilities.cs index d55b6a2..1c00021 100755 --- a/src/Tizen.Multimedia.Camera/Camera/CameraCapabilities.cs +++ b/src/Tizen.Multimedia.Camera/Camera/CameraCapabilities.cs @@ -82,92 +82,92 @@ namespace Tizen.Multimedia /// /// Gets the face detection feature's supported state. - /// true if supported, otherwise false. /// + /// true if supported, otherwise false. /// 3 public bool IsFaceDetectionSupported { get; } /// /// Gets the media packet preview callback feature's supported state. - /// true if supported, otherwise false. /// + /// true if supported, otherwise false. /// 3 public bool IsMediaPacketPreviewCallbackSupported { get; } /// /// Gets the zero shutter lag feature's supported state. - /// true if supported, otherwise false. /// + /// true if supported, otherwise false. /// 3 public bool IsZeroShutterLagSupported { get; } /// - /// Gets continuous capture feature's supported state. - /// true if supported, otherwise false. + /// Gets the continuous capture feature's supported state. /// + /// true if supported, otherwise false. /// 3 public bool IsContinuousCaptureSupported { get; } /// - /// Gets the support state of HDR capture. - /// true if supported, otherwise false. + /// Gets the support state of the HDR capture. /// + /// true if supported, otherwise false. /// 3 public bool IsHdrCaptureSupported { get; } /// /// Gets the support state of the anti-shake feature. - /// true if supported, otherwise false. /// + /// true if supported, otherwise false. /// 3 public bool IsAntiShakeSupported { get; } /// /// Gets the support state of the video stabilization feature. - /// true if supported, otherwise false. /// + /// true if supported, otherwise false. /// 3 public bool IsVideoStabilizationSupported { get; } /// /// Gets the support state of auto contrast feature. - /// true if supported, otherwise false. /// + /// true if supported, otherwise false. /// 3 public bool IsAutoContrastSupported { get; } /// - /// Gets the support state of brightness feature. - /// true if supported, otherwise false. + /// Gets the support state of the brightness feature. /// + /// true if supported, otherwise false. /// 3 public bool IsBrigtnessSupported { get; } /// - /// Gets the support state of exposure feature. - /// true if supported, otherwise false. + /// Gets the support state of the exposure feature. /// + /// true if supported, otherwise false. /// 3 public bool IsExposureSupported { get; } /// - /// Gets the support state of zoom feature. - /// true if supported, otherwise false. + /// Gets the support state of the zoom feature. /// + /// true if supported, otherwise false. /// 3 public bool IsZoomSupported { get; } /// - /// Gets the support state of pan feature. - /// true if supported, otherwise false. + /// Gets the support state of the pan feature. /// + /// true if supported, otherwise false. /// 3 public bool IsPanSupported { get; } /// - /// Gets the support state of tilt feature. - /// true if supported, otherwise false. + /// Gets the support state of the tilt feature. /// + /// true if supported, otherwise false. /// 3 public bool IsTiltSupported { get; } @@ -177,9 +177,8 @@ namespace Tizen.Multimedia /// 3 /// /// It returns a list containing all the supported preview resolutions. - /// by recorder. /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedPreviewResolutions { get @@ -200,7 +199,7 @@ namespace Tizen.Multimedia /// /// It returns a list containing all the supported capture resolutions. /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedCaptureResolutions { get @@ -221,7 +220,7 @@ namespace Tizen.Multimedia /// /// It returns a list containing all the supported . /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedCapturePixelFormats { get @@ -242,7 +241,7 @@ namespace Tizen.Multimedia /// /// It returns a list containing all the supported . /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedPreviewPixelFormats { get @@ -263,7 +262,7 @@ namespace Tizen.Multimedia /// /// It returns a list containing all the supported . /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedPreviewFps { get @@ -286,7 +285,7 @@ namespace Tizen.Multimedia /// /// It returns a list containing all the supported by resolution. /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable GetSupportedPreviewFpsByResolution(int width, int height) { return GetSupportedPreviewFpsByResolutions(width, height); @@ -300,7 +299,7 @@ namespace Tizen.Multimedia /// /// It returns a list containing all the supported by resolution. /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable GetSupportedPreviewFpsByResolution(Size size) { return GetSupportedPreviewFpsByResolutions(size.Width, size.Height); @@ -313,7 +312,7 @@ namespace Tizen.Multimedia /// /// It returns a list containing all the supported . /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedAutoFocusModes { get @@ -334,7 +333,7 @@ namespace Tizen.Multimedia /// /// It returns a list containing all the supported . /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedExposureModes { get @@ -349,13 +348,13 @@ namespace Tizen.Multimedia } /// - /// Retrieves all the Iso level supported by the camera. + /// Retrieves all the ISO levels supported by the camera. /// /// 3 /// /// It returns a list containing all the supported . /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedIsoLevels { get @@ -376,7 +375,7 @@ namespace Tizen.Multimedia /// /// It returns a list containing all the supported . /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedTheaterModes { get @@ -391,13 +390,13 @@ namespace Tizen.Multimedia } /// - /// Retrieves all the whitebalance modes supported by the camera. + /// Retrieves all the white balance modes supported by the camera. /// /// 3 /// /// It returns a list containing all the supported . /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedWhiteBalances { get @@ -418,7 +417,7 @@ namespace Tizen.Multimedia /// /// It returns a list containing all the supported . /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedFlashModes { get @@ -439,7 +438,7 @@ namespace Tizen.Multimedia /// /// It returns a list containing all the supported . /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedSceneModes { get @@ -460,7 +459,7 @@ namespace Tizen.Multimedia /// /// It returns a list containing all the supported . /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedEffects { get @@ -475,13 +474,13 @@ namespace Tizen.Multimedia } /// - /// Retrieves all the stream rotation supported by the camera. + /// Retrieves all the stream rotations supported by the camera. /// /// 3 /// /// An IEnumerable containing all the supported . /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedStreamRotations { get @@ -502,7 +501,7 @@ namespace Tizen.Multimedia /// /// It returns a list containing all the supported . /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedStreamFlips { get @@ -517,13 +516,13 @@ namespace Tizen.Multimedia } /// - /// Retrieves all the ptz types by the camera. + /// Retrieves all the PTZ types by the camera. /// /// 3 /// /// It returns a list containing all the supported . /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public IEnumerable SupportedPtzTypes { get diff --git a/src/Tizen.Multimedia.Camera/Camera/CameraCapturingEventArgs.cs b/src/Tizen.Multimedia.Camera/Camera/CameraCapturingEventArgs.cs index 584b529..4b92096 100755 --- a/src/Tizen.Multimedia.Camera/Camera/CameraCapturingEventArgs.cs +++ b/src/Tizen.Multimedia.Camera/Camera/CameraCapturingEventArgs.cs @@ -37,7 +37,7 @@ namespace Tizen.Multimedia public StillImage MainImage { get; } /// - /// The image data of the postview. + /// The image data of the post view. /// /// 3 public StillImage PostView { get; } diff --git a/src/Tizen.Multimedia.Camera/Camera/CameraDeviceStateChangedEventArgs.cs b/src/Tizen.Multimedia.Camera/Camera/CameraDeviceStateChangedEventArgs.cs index 32353f1..2270436 100755 --- a/src/Tizen.Multimedia.Camera/Camera/CameraDeviceStateChangedEventArgs.cs +++ b/src/Tizen.Multimedia.Camera/Camera/CameraDeviceStateChangedEventArgs.cs @@ -19,7 +19,7 @@ using System; namespace Tizen.Multimedia { /// - /// An extended EventArgs class which contains details about previous and current state + /// An extended EventArgs class which contains details about the previous and the current state /// of the camera when its state is changed. /// public class CameraDeviceStateChangedEventArgs : EventArgs @@ -31,13 +31,13 @@ namespace Tizen.Multimedia } /// - /// Camera device type. + /// The camera device type. /// /// 3 public CameraDevice Device { get; } /// - /// Current state of the camera device. + /// The current state of the camera device. /// /// 3 public CameraDeviceState State { get; } diff --git a/src/Tizen.Multimedia.Camera/Camera/CameraDisplaySettings.cs b/src/Tizen.Multimedia.Camera/Camera/CameraDisplaySettings.cs index 8fcad37..eeddd87 100755 --- a/src/Tizen.Multimedia.Camera/Camera/CameraDisplaySettings.cs +++ b/src/Tizen.Multimedia.Camera/Camera/CameraDisplaySettings.cs @@ -21,8 +21,8 @@ namespace Tizen.Multimedia { /// /// The CameraDisplay class allows you to manage display for the camera. - /// It allows to set and get various display properties such as - /// rotation, display visibility and display mode. + /// It allows to set and get various display properties, such as + /// rotation, display visibility, and display mode. /// public class CameraDisplaySettings { @@ -42,7 +42,7 @@ namespace Tizen.Multimedia /// /// A that specifies the display mode. /// Display type is incorrect. - /// The camera already has been disposed. + /// The camera already has been disposed of. public CameraDisplayMode Mode { get @@ -63,14 +63,14 @@ namespace Tizen.Multimedia /// /// The display visibility. - /// True if camera display visible, otherwise false. /// + /// true if camera display is visible, otherwise false. /// 3 /// /// This property is meaningful only in overlay or EVAS surface display type. /// /// Display type is incorrect. - /// The camera already has been disposed. + /// The camera already has been disposed of. public bool Visible { get @@ -95,9 +95,9 @@ namespace Tizen.Multimedia /// /// This property is meaningful only in overlay or EVAS surface display type. /// - /// A that specifies the rotation of camera device. + /// A that specifies the rotation of the camera device. /// Display type is incorrect. - /// The camera already has been disposed. + /// The camera already has been disposed of. public Rotation Rotation { get @@ -124,9 +124,9 @@ namespace Tizen.Multimedia /// /// This property is meaningful only in overlay or EVAS surface display type. /// - /// A that specifies camera flip type. + /// A that specifies the camera flip type. /// Display type is incorrect. - /// The camera already has been disposed. + /// The camera already has been disposed of. public Flips Flip { get @@ -154,7 +154,7 @@ namespace Tizen.Multimedia /// This property is meaningful only in overlay or EVAS surface display type. /// /// Display type is incorrect. - /// The camera already has been disposed. + /// The camera already has been disposed of. public Rectangle RoiArea { get diff --git a/src/Tizen.Multimedia.Camera/Camera/CameraEnums.cs b/src/Tizen.Multimedia.Camera/Camera/CameraEnums.cs index 65dce11..8a5e898 100644 --- a/src/Tizen.Multimedia.Camera/Camera/CameraEnums.cs +++ b/src/Tizen.Multimedia.Camera/Camera/CameraEnums.cs @@ -19,23 +19,23 @@ using System; namespace Tizen.Multimedia { /// - /// Enumeration for Camera device. + /// Enumeration for the camera device. /// /// 3 public enum CameraDevice { /// - /// Rear Camera device. + /// The rear camera device. /// Rear, /// - /// Front Camera device. + /// The front camera device. /// Front } /// - /// Enumeration for Camera device state. + /// Enumeration for the camera device state. /// /// 3 public enum CameraDeviceState @@ -49,13 +49,13 @@ namespace Tizen.Multimedia /// Opened, /// - /// Now previewing or capturing or is being used for video recording. + /// Now previewing or capturing or is being used for the video recording. /// Working } /// - /// Enumeration for the facing direction of camera module . + /// Enumeration for the facing direction of camera module. /// /// 3 public enum CameraFacingDirection @@ -65,7 +65,7 @@ namespace Tizen.Multimedia /// Rear, /// - /// Front direction + /// Front direction. /// Front } @@ -77,11 +77,11 @@ namespace Tizen.Multimedia public enum CameraFlashState { /// - /// Flash is not used now through camera API. + /// Flash is not used now through the camera API. /// NotUsed, /// - /// Flash is used now through camera API. + /// Flash is used now through the camera API. /// Used } @@ -97,11 +97,11 @@ namespace Tizen.Multimedia /// Released, /// - /// Focus in progress + /// Focus in progress. /// Ongoing, /// - /// Focus succeeded + /// Focus succeeded. /// Focused, /// @@ -125,7 +125,7 @@ namespace Tizen.Multimedia /// Nv12, /// - /// NV12 Tiled pixel format. + /// NV12 tiled pixel format. /// Nv12t, /// @@ -193,11 +193,11 @@ namespace Tizen.Multimedia /// None, /// - /// Security policy + /// Security policy. /// Security = 4, /// - /// Resource conflict + /// Resource conflict. /// ResourceConflict } @@ -231,25 +231,25 @@ namespace Tizen.Multimedia } /// - /// Enumeration for the auto focus mode. + /// Enumeration for the auto-focus mode. /// /// 3 public enum CameraAutoFocusMode { /// - /// auto-focus is not set. + /// Auto-focus is not set. /// None, /// - /// auto-focus in the normal mode. + /// Auto-focus is in the normal mode. /// Normal, /// - /// auto-focus in the macro mode(close distance). + /// Auto-focus is in the macro mode (close distance). /// Macro, /// - /// auto-focus in the full mode(all range scan, limited by device spec). + /// Auto-focus is in the full mode (all range scan, limited by device spec). /// Full } @@ -349,7 +349,7 @@ namespace Tizen.Multimedia /// VintageWarm, /// - /// Vintage cold . + /// Vintage cold. /// VintageCold, /// @@ -361,27 +361,27 @@ namespace Tizen.Multimedia /// Cartoon, /// - /// Selective color - Red. + /// Selective color - red. /// SelectiveRed, /// - /// Selective color - Green. + /// Selective color - green. /// SelectiveGreen, /// - /// Selective color - Blue. + /// Selective color - blue. /// SelectiveBlue, /// - /// Selective color - Yellow. + /// Selective color - yellow. /// SelectiveYellow, /// - /// Selective color - Red and Yellow. + /// Selective color - red and yellow. /// SelectiveRedYellow, /// - /// Other Graphic effects. + /// Other graphic effects. /// OtherGraphics } @@ -455,73 +455,73 @@ namespace Tizen.Multimedia } /// - /// Enumeration for preview FPS. + /// Enumeration for the preview fps. /// /// 3 public enum CameraFps { /// - /// Auto FPS. + /// Auto fps. /// Auto = 0, /// - /// 7 FPS. + /// 7 fps. /// Fps7 = 7, /// - /// 8 FPS. + /// 8 fps. /// Fps8 = 8, /// - /// 15 FPS. + /// 15 fps. /// Fps15 = 15, /// - /// 20 FPS. + /// 20 fps. /// Fps20 = 20, /// - /// 24 FPS. + /// 24 fps. /// Fps24 = 24, /// - /// 25 FPS. + /// 25 fps. /// Fps25 = 25, /// - /// 30 FPS. + /// 30 fps. /// Fps30 = 30, /// - /// 60 FPS. + /// 60 fps. /// Fps60 = 60, /// - /// 90 FPS. + /// 90 fps. /// Fps90 = 90, /// - /// 120 FPS. + /// 120 fps. /// Fps120 = 120 } /// - /// Enumeration for HDR capture mode. + /// Enumeration for the HDR capture mode. /// /// 3 public enum CameraHdrMode { /// - /// Disable HDR capture. + /// Disable the HDR capture. /// Disable, /// - /// Enable HDR capture. + /// Enable the HDR capture. /// Enable, /// - /// Enable HDR capture and keep original image data. + /// Enable the HDR capture mode and keep original image data. /// KeepOriginal } @@ -567,7 +567,7 @@ namespace Tizen.Multimedia } /// - /// Enumeration for PTZ(Pan Tilt Zoom) movement type. + /// Enumeration for the PTZ(Pan Tilt Zoom) movement type. /// /// 3 public enum CameraPtzMoveType @@ -577,13 +577,13 @@ namespace Tizen.Multimedia /// Absoulute, /// - /// Move a specific distance from the current position. + /// Move to a specific distance from the current position. /// Relative } /// - /// Enumeration for PTZ(Pan Tilt Zoom) type. + /// Enumeration for the PTZ(Pan Tilt Zoom) type. /// /// 3 public enum CameraPtzType @@ -621,11 +621,11 @@ namespace Tizen.Multimedia /// Sports, /// - /// Party & Indoor. + /// Party and indoor. /// PartyAndIndoor, /// - /// Beach & Indoor. + /// Beach and indoor. /// BeachAndIndoor, /// @@ -633,7 +633,7 @@ namespace Tizen.Multimedia /// Sunset, /// - /// Dusk & Dawn. + /// Dusk and dawn. /// DuskAndDawn, /// @@ -677,35 +677,35 @@ namespace Tizen.Multimedia public enum CameraTagOrientation { /// - /// Row #0 is at the top, Column #0 is to the left. + /// Row #0 is at the top, column #0 is to the left. /// TopLeft = 1, /// - /// Row #0 is at the top, Column #0 is to the right. + /// Row #0 is at the top, column #0 is to the right. /// TopRight = 2, /// - /// Row #0 is at the bottom, Column #0 is to the right. + /// Row #0 is at the bottom, column #0 is to the right. /// BottomRight = 3, /// - /// Row #0 is at the bottom, Column #0 is to the left. + /// Row #0 is at the bottom, column #0 is to the left. /// BottomLeft = 4, /// - /// Row #0 is at the left, Column #0 is to the top. + /// Row #0 is at the left, column #0 is to the top. /// LeftTop = 5, /// - /// Row #0 is at the right, Column #0 is to the top. + /// Row #0 is at the right, column #0 is to the top. /// RightTop = 6, /// - /// Row #0 is at the right, Column #0 is to the bottom. + /// Row #0 is at the right, column #0 is to the bottom. /// RightBottom = 7, /// - /// Row #0 is at the left, Column #0 is to the bottom. + /// Row #0 is at the left, column #0 is to the bottom. /// LeftBottom = 8 } @@ -717,21 +717,21 @@ namespace Tizen.Multimedia public enum CameraTheaterMode { /// - /// Disable theater mode - External display shows same image as device display. + /// Disable the theater mode - the external display shows same image as the device display. /// Disable, /// - /// Clone mode - Preview image is displayed on external display with full screen mode. Also preview image is shown by the UI on device display. + /// Clone the mode - the preview image is displayed on an external display with full screen mode. Also, the preview image is shown by the UI on the device display. /// Clone, /// - /// Enable theater mode - Preview image is displayed on external display with full screen mode, but preview image is not shown on device display. + /// Enable the theater mode - the preview image is displayed on an external display with full screen mode, but the preview image is not shown on the device display. /// Enable } /// - ///Enumeration for the white balance levels of the camera. + /// Enumeration for the white balance levels of the camera. /// /// 3 public enum CameraWhiteBalance @@ -789,7 +789,7 @@ namespace Tizen.Multimedia /// LetterBox, /// - /// Origin size. + /// Original size. /// OriginSize, /// @@ -811,7 +811,7 @@ namespace Tizen.Multimedia } /// - /// Enumeration for camera failure error. + /// Enumeration for the camera failure error. /// /// 3 public enum CameraErrorCode @@ -835,7 +835,7 @@ namespace Tizen.Multimedia } /// - /// Enumeration for Image datatype. + /// Enumeration for the image datatype. /// /// 3 public enum PlaneType diff --git a/src/Tizen.Multimedia.Camera/Camera/CameraErrorOccurredEventArgs.cs b/src/Tizen.Multimedia.Camera/Camera/CameraErrorOccurredEventArgs.cs index 883596b..de2032c 100755 --- a/src/Tizen.Multimedia.Camera/Camera/CameraErrorOccurredEventArgs.cs +++ b/src/Tizen.Multimedia.Camera/Camera/CameraErrorOccurredEventArgs.cs @@ -19,8 +19,8 @@ using System; namespace Tizen.Multimedia { /// - /// An extended EventArgs class which contains details about error status and - /// state of the camera when it failed. + /// An extended EventArgs class which contains details about the error status and the + /// state of the camera when it fails. /// public class CameraErrorOccurredEventArgs : EventArgs { diff --git a/src/Tizen.Multimedia.Camera/Camera/CameraFocusStateChangedEventArgs.cs b/src/Tizen.Multimedia.Camera/Camera/CameraFocusStateChangedEventArgs.cs index c288d73..9826506 100755 --- a/src/Tizen.Multimedia.Camera/Camera/CameraFocusStateChangedEventArgs.cs +++ b/src/Tizen.Multimedia.Camera/Camera/CameraFocusStateChangedEventArgs.cs @@ -19,8 +19,7 @@ using System; namespace Tizen.Multimedia { /// - /// An extended EventArgs class which contains details about focus state of the - /// camera. + /// An extended EventArgs class which contains details about the focus state of the camera. /// public class CameraFocusStateChangedEventArgs : EventArgs { @@ -30,7 +29,7 @@ namespace Tizen.Multimedia } /// - /// Focus state of the camera. + /// The focus state of the camera. /// /// 3 public CameraFocusState State { get; } diff --git a/src/Tizen.Multimedia.Camera/Camera/CameraInterruptedEventArgs.cs b/src/Tizen.Multimedia.Camera/Camera/CameraInterruptedEventArgs.cs index 4ce158a..664f159 100755 --- a/src/Tizen.Multimedia.Camera/Camera/CameraInterruptedEventArgs.cs +++ b/src/Tizen.Multimedia.Camera/Camera/CameraInterruptedEventArgs.cs @@ -19,8 +19,8 @@ using System; namespace Tizen.Multimedia { /// - /// An extended EventArgs class which contains details about previous and current state - /// of the camera when its interrupted. + /// An extended EventArgs class which contains details about the previous and the current state + /// of the camera when it is interrupted. /// public class CameraInterruptedEventArgs : EventArgs { @@ -32,13 +32,13 @@ namespace Tizen.Multimedia } /// - /// Previous state of the camera. + /// The previous state of the camera. /// /// 3 public CameraState Previous { get; } /// - /// Current state of the camera. + /// The current state of the camera. /// /// 3 public CameraState Current { get; } diff --git a/src/Tizen.Multimedia.Camera/Camera/CameraSettings.cs b/src/Tizen.Multimedia.Camera/Camera/CameraSettings.cs index 9d8c2bc..e42ee1f 100755 --- a/src/Tizen.Multimedia.Camera/Camera/CameraSettings.cs +++ b/src/Tizen.Multimedia.Camera/Camera/CameraSettings.cs @@ -64,17 +64,17 @@ namespace Tizen.Multimedia #region Auto Focus /// - /// Sets auto focus area. + /// Sets the auto focus area. /// /// 3 /// /// should not be the . /// - /// X position - /// Y position + /// X position. + /// Y position. /// In case of invalid parameters. /// In case of any invalid operations. - /// The camera already has been disposed. + /// The camera already has been disposed of. public void SetAutoFocusArea(int x, int y) { CameraErrorFactory.ThrowIfError(Native.SetAutoFocusArea(_camera.GetHandle(), x, y), @@ -82,16 +82,16 @@ namespace Tizen.Multimedia } /// - /// Sets auto focus area. + /// Sets the auto focus area. /// /// 3 /// /// should not be the . /// - /// structure including X, Y position + /// structure including X, Y position. /// In case of invalid parameters. /// In case of any invalid operations. - /// The camera already has been disposed. + /// The camera already has been disposed of. public void SetAutoFocusArea(Point pos) { CameraErrorFactory.ThrowIfError(Native.SetAutoFocusArea(_camera.GetHandle(), pos.X, pos.Y), @@ -102,7 +102,7 @@ namespace Tizen.Multimedia /// Clears the auto focus area. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public void ClearFocusArea() { CameraErrorFactory.ThrowIfError(Native.ClearAutoFocusArea(_camera.GetHandle()), @@ -114,7 +114,7 @@ namespace Tizen.Multimedia /// /// 3 /// A that specifies the auto focus mode. - /// The camera already has been disposed. + /// The camera already has been disposed of. public CameraAutoFocusMode AutoFocusMode { get @@ -141,7 +141,7 @@ namespace Tizen.Multimedia /// The contrast level of the camera. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public int Contrast { get @@ -164,7 +164,7 @@ namespace Tizen.Multimedia /// If true auto contrast is enabled, otherwise false. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public bool AutoContrast { get @@ -186,7 +186,7 @@ namespace Tizen.Multimedia /// /// 3 /// - /// If min value is greater than the max value, it means this feature is not supported. + /// If the mininum value is greater than the maximum value, it means this feature is not supported. /// /// In case of this feature is not supported. public Range ContrastRange @@ -208,7 +208,7 @@ namespace Tizen.Multimedia /// The brightness level of the camera. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public int Brightness { get @@ -231,7 +231,7 @@ namespace Tizen.Multimedia /// /// 3 /// - /// If min value is greater than the max value, it means this feature is not supported. + /// If the minimum value is greater than the maximum value, it means this feature is not supported. /// /// In case of this feature is not supported. public Range BrightnessRange @@ -253,7 +253,7 @@ namespace Tizen.Multimedia /// The exposure value. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public int Exposure { get @@ -276,7 +276,7 @@ namespace Tizen.Multimedia /// /// 3 /// A that specifies the exposure mode. - /// The camera already has been disposed. + /// The camera already has been disposed of. public CameraExposureMode ExposureMode { get @@ -302,7 +302,7 @@ namespace Tizen.Multimedia /// /// 3 /// - /// If min value is greater than the max value, it means this feature is not supported. + /// If the minimum value is greater than the maximum value, it means this feature is not supported. /// /// In case of this feature is not supported. public Range ExposureRange @@ -322,10 +322,10 @@ namespace Tizen.Multimedia #region Zoom /// /// The zoom level. - /// The range for zoom level is received from ZoomRange property. + /// The range for the zoom level is received from the ZoomRange property. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public int ZoomLevel { get @@ -348,7 +348,7 @@ namespace Tizen.Multimedia /// /// 3 /// - /// If min value is greater than the max value, it means this feature is not supported. + /// If the minimum value is greater than the maximum value, it means this feature is not supported. /// /// In case of this feature is not supported. public Range ZoomRange @@ -366,11 +366,11 @@ namespace Tizen.Multimedia #endregion Zoom /// - /// The whitebalance mode. + /// The white balance mode. /// /// 3 /// A that specifies the white balance mode. - /// The camera already has been disposed. + /// The camera already has been disposed of. public CameraWhiteBalance WhiteBalance { get @@ -395,8 +395,8 @@ namespace Tizen.Multimedia /// The ISO level. /// /// 3 - /// A that specifies ISO level. - /// The camera already has been disposed. + /// A that specifies the ISO level. + /// The camera already has been disposed of. public CameraIsoLevel IsoLevel { get @@ -419,10 +419,10 @@ namespace Tizen.Multimedia /// /// The quality of the image. - /// The range for image quality is 1 to 100. + /// The range for the image quality is 1 to 100. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public int ImageQuality { get @@ -450,8 +450,8 @@ namespace Tizen.Multimedia /// The preview frame rate. /// /// 3 - /// A that specifies preview frame rate. - /// The camera already has been disposed. + /// A that specifies the preview frame rate. + /// The camera already has been disposed of. public CameraFps PreviewFps { get @@ -471,11 +471,11 @@ namespace Tizen.Multimedia } /// - /// Gets or sets the resolution of preview + /// Gets or sets the resolution of the preview. /// /// 3 /// In case of invalid parameters. - /// The camera already has been disposed. + /// The camera already has been disposed of. public Size PreviewResolution { get @@ -498,10 +498,10 @@ namespace Tizen.Multimedia /// /// 3 /// - /// Depending on the capture resolution aspect ratio and display resolution, + /// Depending on the capture resolution aspect ratio and the display resolution, /// the recommended preview resolution is determined. /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public Size RecommendedPreviewResolution { get @@ -517,9 +517,9 @@ namespace Tizen.Multimedia /// The preview data format. /// /// 3 - /// A that specifies the pixel format of preview data. + /// A that specifies the pixel format of the preview data. /// In case of invalid parameters. - /// The camera already has been disposed. + /// The camera already has been disposed of. public CameraPixelFormat PreviewPixelFormat { get @@ -542,8 +542,8 @@ namespace Tizen.Multimedia /// Resolution of the captured image. /// /// 3 - /// In case of invalid parameters - /// The camera already has been disposed. + /// In case of invalid parameters. + /// The camera already has been disposed of. public Size CaptureResolution { get @@ -569,7 +569,7 @@ namespace Tizen.Multimedia /// 3 /// A that specifies the pixel format of captured image. /// In case of invalid parameters. - /// The camera already has been disposed. + /// The camera already has been disposed of. public CameraPixelFormat CapturePixelFormat { get @@ -591,10 +591,10 @@ namespace Tizen.Multimedia #region Encoded preview /// - /// The bit rate of encoded preview. + /// The bit rate of the encoded preview. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public int EncodedPreviewBitrate { get @@ -613,10 +613,10 @@ namespace Tizen.Multimedia } /// - /// GOP(Group Of Pictures) interval of encoded preview. + /// The GOP(Group Of Pictures) interval of the encoded preview. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public int EncodedPreviewGopInterval { get @@ -639,12 +639,12 @@ namespace Tizen.Multimedia /// The theater mode. /// /// 3 - /// A that specifies theater mode. + /// A that specifies the theater mode. /// /// If you want to display the preview image on the external display with the full screen mode, /// use this property. /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public CameraTheaterMode TheaterMode { get @@ -667,8 +667,8 @@ namespace Tizen.Multimedia /// The camera effect mode. /// /// 3 - /// A that specifies effect mode. - /// The camera already has been disposed. + /// A that specifies the effect mode. + /// The camera already has been disposed of. public CameraEffectMode Effect { get @@ -691,8 +691,8 @@ namespace Tizen.Multimedia /// The scene mode. /// /// 3 - /// A that specifies scene mode. - /// The camera already has been disposed. + /// A that specifies the scene mode. + /// The camera already has been disposed of. public CameraSceneMode SceneMode { get @@ -715,8 +715,8 @@ namespace Tizen.Multimedia /// The camera's flash mode. /// /// 3 - /// A that specifies flash mode. - /// The camera already has been disposed. + /// A that specifies the flash mode. + /// The camera already has been disposed of. public CameraFlashMode FlashMode { get @@ -739,7 +739,7 @@ namespace Tizen.Multimedia /// Gets the camera lens orientation angle. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public int LensOrientation { get @@ -756,7 +756,7 @@ namespace Tizen.Multimedia /// /// 3 /// A that specifies the rotation of camera device. - /// The camera already has been disposed. + /// The camera already has been disposed of. public Rotation StreamRotation { get @@ -780,8 +780,8 @@ namespace Tizen.Multimedia /// The stream flip. /// /// 3 - /// A that specifies camera flip type. - /// The camera already has been disposed. + /// A that specifies the camera flip type. + /// The camera already has been disposed of. public Flips StreamFlip { get @@ -802,16 +802,16 @@ namespace Tizen.Multimedia } /// - /// The mode of HDR(High dynamic range) capture. + /// The mode of the HDR(High dynamic range) capture. /// /// 3 /// A that specifies the HDR mode. /// - /// Taking multiple pictures at different exposure levels and intelligently stitching them together + /// Taking multiple pictures at different exposure levels and intelligently stitching them together, /// so that we eventually arrive at a picture that is representative in both dark and bright areas. - /// If this attribute is set, then eventhandler set for HdrCaptureProgress event is invoked. + /// If this attribute is set, then event handler set for the HdrCaptureProgress event is invoked. /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public CameraHdrMode HdrMode { get @@ -832,10 +832,10 @@ namespace Tizen.Multimedia /// /// The anti shake feature. - /// If true the antishake feature is enabled, otherwise false. + /// If true, the antishake feature is enabled, otherwise false. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public bool AntiShake { get @@ -854,15 +854,15 @@ namespace Tizen.Multimedia } /// - /// Enables/Disables the video stabilization feature. - /// If true video stabilization is enabled, otherwise false. + /// Enables or disables the video stabilization feature. + /// If true, video stabilization is enabled, otherwise false. /// /// 3 /// /// If video stabilization is enabled, zero shutter lag is disabled. /// This feature is used to record a video. /// - /// The camera already has been disposed. + /// The camera already has been disposed of. public bool VideoStabilization { get @@ -890,7 +890,7 @@ namespace Tizen.Multimedia /// In some countries, this operation is not permitted. /// /// Disabling shutter sound is not permitted. - /// The camera already has been disposed. + /// The camera already has been disposed of. public void DisableShutterSound(bool shutterSound) { CameraErrorFactory.ThrowIfError(Native.DisableShutterSound(_camera.GetHandle(), shutterSound), @@ -899,11 +899,11 @@ namespace Tizen.Multimedia #region PTZ(Pan Tilt Zoom), Pan, Tilt /// - /// Sets the type of PTZ(Pan Tilt Zoom). Mechanical or Electronic. + /// Sets the type of the PTZ(Pan Tilt Zoom). Mechanical or electronic. /// /// 3 - /// A that specifies the type of PTZ. - /// The camera already has been disposed. + /// A that specifies the type of the PTZ. + /// The camera already has been disposed of. public CameraPtzType PtzType { set @@ -919,10 +919,10 @@ namespace Tizen.Multimedia /// Sets the position to move horizontally. /// /// 3 - /// ptz move type. - /// pan step + /// The PTZ move type. . + /// The pan step. /// In case of invalid parameters. - /// The camera already has been disposed. + /// The camera already has been disposed of. public void SetPan(CameraPtzMoveType type, int panStep) { ValidationUtil.ValidateEnum(typeof(CameraPtzMoveType), type, nameof(type)); @@ -934,8 +934,8 @@ namespace Tizen.Multimedia /// Gets the current position of the camera. /// /// 3 - /// Returns the camera's horizontal position - /// The camera already has been disposed. + /// Returns the camera's horizontal position. + /// The camera already has been disposed of. public int GetPan() { CameraErrorFactory.ThrowIfError(Native.GetPan(_camera.GetHandle(), out int val), @@ -948,10 +948,10 @@ namespace Tizen.Multimedia /// Sets the position to move vertically. /// /// 3 - /// ptz move type - /// tilt step + /// the PTZ move type. + /// The tilt step. /// In case of invalid parameters. - /// The camera already has been disposed. + /// The camera already has been disposed of. public void SetTilt(CameraPtzMoveType type, int tiltStep) { ValidationUtil.ValidateEnum(typeof(CameraPtzMoveType), type, nameof(type)); @@ -963,8 +963,8 @@ namespace Tizen.Multimedia /// Gets the current position of the camera. /// /// 3 - /// Returns the current vertical position - /// The camera already has been disposed. + /// Returns the current vertical position. + /// The camera already has been disposed of. public int GetTilt() { CameraErrorFactory.ThrowIfError(Native.GetTilt(_camera.GetHandle(), out int val), @@ -974,11 +974,11 @@ namespace Tizen.Multimedia } /// - /// Gets lower limit and upper limit for pan position. + /// Gets the lower limit and the upper limit for the pan position. /// /// 3 /// - /// If min value is greater than the max value, it means this feature is not supported. + /// If the minimum value is greater than the maximum value, it means this feature is not supported. /// /// In case of this feature is not supported. public Range PanRange @@ -995,11 +995,11 @@ namespace Tizen.Multimedia } /// - /// Gets lower limit and upper limit for tilt position. + /// Gets the lower limit and the upper limit for the tilt position. /// /// 3 /// - /// If min value is greater than the max value, it means this feature is not supported. + /// If the minimum value is greater than the maximum value, it means this feature is not supported. /// /// In case of this feature is not supported. public Range TiltRange @@ -1019,10 +1019,10 @@ namespace Tizen.Multimedia #region EXIF tag /// /// The scene mode. - /// true if EXIF tags are enabled in JPEG file, otherwise false. /// + /// true if EXIF tags are enabled in the JPEG file, otherwise false. /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public bool EnableTag { get @@ -1044,7 +1044,7 @@ namespace Tizen.Multimedia /// The camera image description in the EXIF tag. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public string ImageDescriptionTag { get @@ -1074,7 +1074,7 @@ namespace Tizen.Multimedia /// The software information in the EXIF tag. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public string SoftwareTag { get @@ -1102,10 +1102,10 @@ namespace Tizen.Multimedia } /// - /// The geotag(GPS data) in the EXIF tag. + /// The geo tag(GPS data) in the EXIF tag. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public Location GeoTag { get @@ -1124,10 +1124,10 @@ namespace Tizen.Multimedia } /// - /// Removes the geotag(GPS data) in the EXIF(Exchangeable image file format) tag. + /// Removes the geo tag(GPS data) in the EXIF(EXchangeable Image File format) tag. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public void RemoveGeoTag() { CameraErrorFactory.ThrowIfError(Native.RemoveGeotag(_camera.GetHandle()), @@ -1138,7 +1138,7 @@ namespace Tizen.Multimedia /// The camera orientation in the tag. /// /// 3 - /// The camera already has been disposed. + /// The camera already has been disposed of. public CameraTagOrientation OrientationTag { get diff --git a/src/Tizen.Multimedia.Camera/Camera/CameraStateChangedEventArgs.cs b/src/Tizen.Multimedia.Camera/Camera/CameraStateChangedEventArgs.cs index 96e2e0c..0839688 100755 --- a/src/Tizen.Multimedia.Camera/Camera/CameraStateChangedEventArgs.cs +++ b/src/Tizen.Multimedia.Camera/Camera/CameraStateChangedEventArgs.cs @@ -19,7 +19,7 @@ using System; namespace Tizen.Multimedia { /// - /// An extended EventArgs class which contains details about previous and current state + /// An extended EventArgs class which contains details about the previous and the current state /// of the camera when its state is changed. /// public class CameraStateChangedEventArgs : EventArgs @@ -32,21 +32,23 @@ namespace Tizen.Multimedia } /// - /// Previous state of the camera. + /// Gets the previous state of the camera. /// /// 3 public CameraState Previous { get; } /// - /// Current state of the camera. + /// Gets the current state of the camera. /// /// 3 public CameraState Current { get; } /// - /// true if the state changed by policy such as Resource Conflict or Security, otherwise false - /// in normal state change. + /// Gets the value indicating whether the state is changed by policy. /// + /// + /// true if the state changed by policy such as resource conflict or security, otherwise false. + /// /// 3 public bool ByPolicy { get; } } diff --git a/src/Tizen.Multimedia.Camera/Camera/EncodedPlane.cs b/src/Tizen.Multimedia.Camera/Camera/EncodedPlane.cs index d88e596..f1620fb 100755 --- a/src/Tizen.Multimedia.Camera/Camera/EncodedPlane.cs +++ b/src/Tizen.Multimedia.Camera/Camera/EncodedPlane.cs @@ -20,7 +20,7 @@ using static Interop.Camera; namespace Tizen.Multimedia { /// - /// The class containing Encoded image data. + /// The class containing the encoded image data. /// public class EncodedPlane : IPreviewPlane { @@ -31,7 +31,7 @@ namespace Tizen.Multimedia } /// - /// The buffer containing encoded image data. + /// The buffer containing the encoded image data. /// /// 3 public byte[] Data { get; } diff --git a/src/Tizen.Multimedia.Camera/Camera/FaceDetectedEventArgs.cs b/src/Tizen.Multimedia.Camera/Camera/FaceDetectedEventArgs.cs index 6c5feaa..821a0ad 100755 --- a/src/Tizen.Multimedia.Camera/Camera/FaceDetectedEventArgs.cs +++ b/src/Tizen.Multimedia.Camera/Camera/FaceDetectedEventArgs.cs @@ -21,7 +21,7 @@ namespace Tizen.Multimedia { /// /// An extended EventArgs class which contains details about all the faces detected. - /// If user need to remain faces data, user have to copy the data. + /// If the user needs to keep the faces data, the user has to copy the data. /// public class FaceDetectedEventArgs : EventArgs { @@ -31,7 +31,7 @@ namespace Tizen.Multimedia } /// - /// List containing faces of type . + /// The list containing faces of type . /// /// 3 public IEnumerable Faces { get; } diff --git a/src/Tizen.Multimedia.Camera/Camera/FaceDetectionData.cs b/src/Tizen.Multimedia.Camera/Camera/FaceDetectionData.cs index 53905c7..97b8712 100755 --- a/src/Tizen.Multimedia.Camera/Camera/FaceDetectionData.cs +++ b/src/Tizen.Multimedia.Camera/Camera/FaceDetectionData.cs @@ -38,7 +38,7 @@ namespace Tizen.Multimedia } /// - /// The Id of each face. + /// The ID of each face. /// /// 3 public int Id { get; } diff --git a/src/Tizen.Multimedia.Camera/Camera/HdrCaptureProgressEventArgs.cs b/src/Tizen.Multimedia.Camera/Camera/HdrCaptureProgressEventArgs.cs index ce5db62..61ba45b 100755 --- a/src/Tizen.Multimedia.Camera/Camera/HdrCaptureProgressEventArgs.cs +++ b/src/Tizen.Multimedia.Camera/Camera/HdrCaptureProgressEventArgs.cs @@ -19,7 +19,7 @@ using System; namespace Tizen.Multimedia { /// - /// An extended EventArgs class which contains details about the hdr capture progress. + /// An extended EventArgs class which contains details about the HDR capture progress. /// public class HdrCaptureProgressEventArgs : EventArgs { @@ -29,7 +29,7 @@ namespace Tizen.Multimedia } /// - /// Hdr Capture progress in percent. + /// The HDR capture progress in percent. /// /// 3 public int Percent { get; } diff --git a/src/Tizen.Multimedia.Camera/Camera/Location.cs b/src/Tizen.Multimedia.Camera/Camera/Location.cs index 1733352..71c427a 100644 --- a/src/Tizen.Multimedia.Camera/Camera/Location.cs +++ b/src/Tizen.Multimedia.Camera/Camera/Location.cs @@ -17,16 +17,16 @@ namespace Tizen.Multimedia { /// - /// Location class containing GPS data details. + /// The location class containing GPS data details. /// public class Location { /// - /// Public constructor. + /// The public constructor. /// - /// Latitude data - /// Longitude data - /// Altitude data + /// The latitude data. + /// The longitude data. + /// The altitude data. public Location(double latitude, double longitude, double altitude) { Latitude = latitude; @@ -35,19 +35,19 @@ namespace Tizen.Multimedia } /// - /// The Latitude data. + /// The latitude data. /// /// 3 public double Latitude { get; } /// - /// The Longitude data. + /// The longitude data. /// /// 3 public double Longitude { get; } /// - /// The Altitude data. + /// The altitude data. /// /// 3 public double Altitude { get; } diff --git a/src/Tizen.Multimedia.Camera/Camera/MediaPacketPreviewEventArgs.cs b/src/Tizen.Multimedia.Camera/Camera/MediaPacketPreviewEventArgs.cs index 40736c1..3ef9684 100755 --- a/src/Tizen.Multimedia.Camera/Camera/MediaPacketPreviewEventArgs.cs +++ b/src/Tizen.Multimedia.Camera/Camera/MediaPacketPreviewEventArgs.cs @@ -19,7 +19,7 @@ using System; namespace Tizen.Multimedia { /// - /// An extended EventArgs class which contains details about the Media packet preview frame. + /// An extended EventArgs class which contains details about the media packet preview frame. /// public class MediaPacketPreviewEventArgs : EventArgs { @@ -29,7 +29,7 @@ namespace Tizen.Multimedia } /// - /// Media Packet data. + /// The media packet data. /// /// 3 public MediaPacket Packet { get; } diff --git a/src/Tizen.Multimedia.Camera/Camera/PreviewEventArgs.cs b/src/Tizen.Multimedia.Camera/Camera/PreviewEventArgs.cs index fe5d623..28cce51 100755 --- a/src/Tizen.Multimedia.Camera/Camera/PreviewEventArgs.cs +++ b/src/Tizen.Multimedia.Camera/Camera/PreviewEventArgs.cs @@ -29,7 +29,7 @@ namespace Tizen.Multimedia } /// - /// PreviewData frame. + /// The PreviewData frame. /// /// 3 public PreviewFrame Preview { get; } diff --git a/src/Tizen.Multimedia.Camera/Camera/PreviewFrame.cs b/src/Tizen.Multimedia.Camera/Camera/PreviewFrame.cs index e21542d..04962ef 100755 --- a/src/Tizen.Multimedia.Camera/Camera/PreviewFrame.cs +++ b/src/Tizen.Multimedia.Camera/Camera/PreviewFrame.cs @@ -22,7 +22,7 @@ using static Interop.Camera; namespace Tizen.Multimedia { /// - /// The class containing preview image data. + /// The class containing the preview image data. /// public class PreviewFrame { @@ -97,19 +97,19 @@ namespace Tizen.Multimedia public Size Resolution { get; } /// - /// The timestamp of preview frame. + /// The time stamp of the preview frame. /// /// 3 public uint TimeStamp { get; } /// - /// The type of preview plane. + /// The type of the preview plane. /// /// 3 public PlaneType PlaneType { get; } /// - /// The buffer including preview frame. + /// The buffer including the preview frame. /// /// 3 public IPreviewPlane Plane { get; } diff --git a/src/Tizen.Multimedia.Camera/Camera/SinglePlane.cs b/src/Tizen.Multimedia.Camera/Camera/SinglePlane.cs index 33e64f2..9671090 100755 --- a/src/Tizen.Multimedia.Camera/Camera/SinglePlane.cs +++ b/src/Tizen.Multimedia.Camera/Camera/SinglePlane.cs @@ -20,7 +20,7 @@ using static Interop.Camera; namespace Tizen.Multimedia { /// - /// The class containing image data which has single plane. + /// The class containing the image data, which has a single plane. /// public class SinglePlane : IPreviewPlane { diff --git a/src/Tizen.Multimedia.Camera/Camera/StillImage.cs b/src/Tizen.Multimedia.Camera/Camera/StillImage.cs index 7fb3b69..fabb9eb 100755 --- a/src/Tizen.Multimedia.Camera/Camera/StillImage.cs +++ b/src/Tizen.Multimedia.Camera/Camera/StillImage.cs @@ -64,7 +64,7 @@ namespace Tizen.Multimedia public Size Resolution { get; } /// - /// The buffer containing still image. + /// The buffer containing the still image. /// /// 3 public byte[] Data { get; } diff --git a/src/Tizen.Multimedia.Remoting/Interop/Interop.MediaControllerServer.cs b/src/Tizen.Multimedia.Remoting/Interop/Interop.MediaControllerServer.cs index 6fe514d..abd6e58 100644 --- a/src/Tizen.Multimedia.Remoting/Interop/Interop.MediaControllerServer.cs +++ b/src/Tizen.Multimedia.Remoting/Interop/Interop.MediaControllerServer.cs @@ -62,5 +62,14 @@ internal static partial class Interop [DllImport(Libraries.MediaController, EntryPoint = "mc_server_unset_playback_state_command_received_cb")] internal static extern MediaControllerError UnsetPlaybackStateCmdRecvCb(IntPtr handle); + + [DllImport(Libraries.MediaController, EntryPoint = "mc_db_connect")] + internal static extern MediaControllerError ConnectDb(out IntPtr dbHandle); + + [DllImport(Libraries.MediaController, EntryPoint = "mc_db_disconnect")] + internal static extern MediaControllerError DisconnectDb(IntPtr dbHandle); + + [DllImport(Libraries.MediaController, EntryPoint = "mc_db_check_server_table_exist")] + internal static extern MediaControllerError CheckServerExist(IntPtr dbHandle, string appId, out bool value); } } diff --git a/src/Tizen.Multimedia.Remoting/MediaController/MediaControlServer.cs b/src/Tizen.Multimedia.Remoting/MediaController/MediaControlServer.cs index f4fcdf2..c4909bb 100644 --- a/src/Tizen.Multimedia.Remoting/MediaController/MediaControlServer.cs +++ b/src/Tizen.Multimedia.Remoting/MediaController/MediaControlServer.cs @@ -27,6 +27,7 @@ namespace Tizen.Multimedia.Remoting public static class MediaControlServer { private static IntPtr _handle = IntPtr.Zero; + private static bool? _isRunning; /// /// Gets a value indicating whether the server is running. @@ -36,53 +37,71 @@ namespace Tizen.Multimedia.Remoting /// public static bool IsRunning { - get => _handle != IntPtr.Zero; + get + { + if (_isRunning.HasValue == false) + { + _isRunning = GetRunningState(); + } + + return _isRunning.Value; + } + } + + private static bool GetRunningState() + { + IntPtr handle = IntPtr.Zero; + try + { + Native.ConnectDb(out handle).ThrowIfError("Failed to retrieve the running state."); + + Native.CheckServerExist(handle, Applications.Application.Current.ApplicationInfo.ApplicationId, + out var value).ThrowIfError("Failed to retrieve the running state."); + + return value; + } + finally + { + if (handle != IntPtr.Zero) + { + Native.DisconnectDb(handle); + } + } } - private static void ThrowIfNotRunning() + private static void EnsureInitializedIfRunning() { + if (_handle != IntPtr.Zero) + { + return; + } + if (IsRunning == false) { throw new InvalidOperationException("The server is not running."); } + + Initialize(); } private static IntPtr Handle { get { - ThrowIfNotRunning(); + EnsureInitializedIfRunning(); return _handle; } } - /// - /// Starts the media control server. - /// - /// - /// When the server starts, will be raised. - /// - /// http://tizen.org/privilege/mediacontroller.server - /// - /// The server has already started.\n - /// -or-\n - /// An internal error occurs. - /// - /// Caller does not have required privilege. - /// - public static void Start() + private static void Initialize() { - if (IsRunning) - { - throw new InvalidOperationException("The server is already running."); - } - Native.Create(out _handle).ThrowIfError("Failed to create media controller server."); try { RegisterPlaybackCommandReceivedEvent(); + _isRunning = true; } catch { @@ -94,6 +113,21 @@ namespace Tizen.Multimedia.Remoting } /// + /// Starts the media control server. + /// + /// + /// When the server starts, will be raised. + /// + /// http://tizen.org/privilege/mediacontroller.server + /// An internal error occurs. + /// Caller does not have required privilege. + /// + public static void Start() + { + Initialize(); + } + + /// /// Stops the media control server. /// /// @@ -107,12 +141,13 @@ namespace Tizen.Multimedia.Remoting /// public static void Stop() { - ThrowIfNotRunning(); + EnsureInitializedIfRunning(); Native.Destroy(_handle).ThrowIfError("Failed to stop the server."); _handle = IntPtr.Zero; _playbackCommandCallback = null; + _isRunning = false; } /// diff --git a/src/Tizen.Network.Connection/Tizen.Network.Connection/CellularProfile.cs b/src/Tizen.Network.Connection/Tizen.Network.Connection/CellularProfile.cs index a9bff16..ebb3f81 100755 --- a/src/Tizen.Network.Connection/Tizen.Network.Connection/CellularProfile.cs +++ b/src/Tizen.Network.Connection/Tizen.Network.Connection/CellularProfile.cs @@ -375,6 +375,7 @@ namespace Tizen.Network.Connection /// /// Default constructor. Initializes an object of the CellularAuthInformation. /// + /// 3 public CellularAuthInformation() { } diff --git a/src/Tizen.Network.Connection/Tizen.Network.Connection/ConnectionManager.cs b/src/Tizen.Network.Connection/Tizen.Network.Connection/ConnectionManager.cs index 9fa8b86..3636f1d 100755 --- a/src/Tizen.Network.Connection/Tizen.Network.Connection/ConnectionManager.cs +++ b/src/Tizen.Network.Connection/Tizen.Network.Connection/ConnectionManager.cs @@ -304,6 +304,7 @@ namespace Tizen.Network.Connection /// /// Adds a route to the routing table. /// + /// 4 /// The address family. /// The name of the network interface. /// The IP address of the host. @@ -328,6 +329,7 @@ namespace Tizen.Network.Connection /// /// Removes a route from the routing table. /// + /// 4 /// The address family. /// The name of network interface. /// The IP address of the host. diff --git a/src/Tizen.Network.Connection/Tizen.Network.Connection/IAddressInformation.cs b/src/Tizen.Network.Connection/Tizen.Network.Connection/IAddressInformation.cs index ee0882a..4a2a475 100755 --- a/src/Tizen.Network.Connection/Tizen.Network.Connection/IAddressInformation.cs +++ b/src/Tizen.Network.Connection/Tizen.Network.Connection/IAddressInformation.cs @@ -113,6 +113,7 @@ namespace Tizen.Network.Connection /// /// The DHCP server address. It is only supported for the IPV4 address family. /// + /// 4 /// Server address of the DHCP. System.Net.IPAddress DhcpServerAddress { get; } } diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/IoTConnectivityClientManager.cs b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/IoTConnectivityClientManager.cs index 9da873d..3d042e0 100755 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/IoTConnectivityClientManager.cs +++ b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/IoTConnectivityClientManager.cs @@ -515,6 +515,7 @@ namespace Tizen.Network.IoTConnectivity ResourceFoundEventArgs e = new ResourceFoundEventArgs() { RequestId = requestId, + EventContinue = true, Resource = resource }; ResourceFound?.Invoke(null, e); @@ -924,6 +925,7 @@ namespace Tizen.Network.IoTConnectivity PlatformInformationFoundEventArgs e = new PlatformInformationFoundEventArgs() { RequestId = requestId, + EventContinue = true, PlatformId = (platformId != IntPtr.Zero) ? Marshal.PtrToStringAnsi(platformId) : string.Empty, ManufacturerName = (manufacturerName != IntPtr.Zero) ? Marshal.PtrToStringAnsi(manufacturerName) : string.Empty, ManufacturerURL = (manufacturerUrl != IntPtr.Zero) ? Marshal.PtrToStringAnsi(manufacturerUrl) : string.Empty, diff --git a/src/Tizen.Network.Nsd/Tizen.Network.Nsd/INsdBrowser.cs b/src/Tizen.Network.Nsd/Tizen.Network.Nsd/INsdBrowser.cs index 9782a33..7fa490a 100755 --- a/src/Tizen.Network.Nsd/Tizen.Network.Nsd/INsdBrowser.cs +++ b/src/Tizen.Network.Nsd/Tizen.Network.Nsd/INsdBrowser.cs @@ -14,6 +14,8 @@ * limitations under the License. */ +using System; + namespace Tizen.Network.Nsd { /// diff --git a/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiManager.cs b/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiManager.cs index 192e11b..1f2dbc9 100755 --- a/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiManager.cs +++ b/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiManager.cs @@ -223,7 +223,7 @@ namespace Tizen.Network.WiFi } /// - /// Gets the result of a specific AP scan. + /// Gets the result of ScanSpecificAPAsync(string essid) API. /// /// 3 /// A list containing the WiFiAP objects. diff --git a/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiNetwork.cs b/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiNetwork.cs index 97e5189..d77be57 100755 --- a/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiNetwork.cs +++ b/src/Tizen.Network.WiFi/Tizen.Network.WiFi/WiFiNetwork.cs @@ -210,7 +210,7 @@ namespace Tizen.Network.WiFi /// /// The Received signal strength indication(RSSI). /// - /// 3 + /// 4 /// Represents Rssi level of WiFi. /// http://tizen.org/feature/network.wifi /// Thrown while setting this property when WiFi is not supported. diff --git a/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar/CalendarDatabase.cs b/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar/CalendarDatabase.cs index 30c95b2..60d9410 100644 --- a/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar/CalendarDatabase.cs +++ b/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar/CalendarDatabase.cs @@ -22,16 +22,6 @@ using System.Diagnostics.CodeAnalysis; namespace Tizen.Pims.Calendar { /// - /// Delegate for detecting the calendar database changes. - /// - /// The record uri - /// - /// The delegate must be registered using AddDBChangedDelegate. - /// It's invoked when the designated view changes. - /// - public delegate void CalendarDBChanged(string uri); - - /// /// CalendarDatabase provides methods to manage calendar information from/to the database. /// /// @@ -40,8 +30,8 @@ namespace Tizen.Pims.Calendar public class CalendarDatabase { private Object thisLock = new Object(); - private Dictionary _callbackMap = new Dictionary(); - private Dictionary _delegateMap = new Dictionary(); + private Dictionary> _eventHandlerMap = new Dictionary>(); + private Dictionary _callbackMap = new Dictionary(); private Interop.Database.DBChangedCallback _dbChangedDelegate; internal CalendarDatabase() @@ -492,46 +482,63 @@ namespace Tizen.Pims.Calendar /// Registers a callback function to be invoked when a record changes. /// /// The view URI of the record to subscribe for change notifications - /// The callback function to register + /// The EventHandler to register /// http://tizen.org/privilege/calendar.read [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings")] - public void AddDBChangedDelegate(string viewUri, CalendarDBChanged callback) + public void AddDBChangedDelegate(string viewUri, EventHandler DBChanged) { Log.Debug(Globals.LogTag, "AddDBChangedDelegate"); - _dbChangedDelegate = (string uri, IntPtr userData) => - { - _callbackMap[uri](uri); - }; - int error = Interop.Database.AddChangedCallback(viewUri, _dbChangedDelegate, IntPtr.Zero); - if (CalendarError.None != (CalendarError)error) - { - Log.Error(Globals.LogTag, "AddDBChangedDelegate Failed with error " + error); - throw CalendarErrorFactory.GetException(error); - } - _callbackMap[viewUri] += callback; - _delegateMap[viewUri] = _dbChangedDelegate; + if (!_callbackMap.ContainsKey(viewUri)) + { + _callbackMap[viewUri] = (string uri, IntPtr userData) => + { + DBChangedEventArgs args = new DBChangedEventArgs(uri); + _eventHandlerMap[uri]?.Invoke(this, args); + }; + + int error = Interop.Database.AddChangedCallback(viewUri, _dbChangedDelegate, IntPtr.Zero); + if (CalendarError.None != (CalendarError)error) + { + Log.Error(Globals.LogTag, "AddDBChangedDelegate Failed with error " + error); + throw CalendarErrorFactory.GetException(error); + } + } + + EventHandler handler = null; + if (!_eventHandlerMap.TryGetValue(viewUri, out handler)) + _eventHandlerMap.Add(viewUri, null); + + _eventHandlerMap[viewUri] = handler + DBChanged; } /// /// Deregisters a callback function. /// /// The view URI of the record to subscribe for change notifications - /// The callback function to register + /// The EventHandler to deregister /// http://tizen.org/privilege/calendar.read [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings")] - public void RemoveDBChangedDelegate(string viewUri, CalendarDBChanged callback) + public void RemoveDBChangedDelegate(string viewUri, EventHandler DBChanged) { Log.Debug(Globals.LogTag, "RemoveDBChangedDelegate"); - int error = Interop.Database.RemoveChangedCallback(viewUri, _delegateMap[viewUri], IntPtr.Zero); - if (CalendarError.None != (CalendarError)error) + EventHandler handler = null; + if (!_eventHandlerMap.TryGetValue(viewUri, out handler)) + _eventHandlerMap.Add(viewUri, null); + else + _eventHandlerMap[viewUri] = handler - DBChanged; + + if (_eventHandlerMap[viewUri] == null) { - Log.Error(Globals.LogTag, "RemoveDBChangedDelegate Failed with error " + error); - throw CalendarErrorFactory.GetException(error); - } - _callbackMap[viewUri] -= callback; - _delegateMap.Remove(viewUri); + int error = Interop.Database.RemoveChangedCallback(viewUri, _callbackMap[viewUri], IntPtr.Zero); + if (CalendarError.None != (CalendarError)error) + { + Log.Error(Globals.LogTag, "RemoveDBChangedDelegate Failed with error " + error); + throw CalendarErrorFactory.GetException(error); + } + _callbackMap.Remove(viewUri); + } } /// diff --git a/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar/DBChangedEventArgs.cs b/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar/DBChangedEventArgs.cs new file mode 100644 index 0000000..7fc8a9c --- /dev/null +++ b/src/Tizen.Pims.Calendar/Tizen.Pims.Calendar/DBChangedEventArgs.cs @@ -0,0 +1,40 @@ +/* +* Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved +* +* Licensed under the Apache License, Version 2.0 (the License); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an AS IS BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +using System; + +namespace Tizen.Pims.Calendar +{ + /// + /// Event arguments passed when calendar database is changed + /// + public class DBChangedEventArgs : EventArgs + { + internal DBChangedEventArgs(string viewUri) + { + ViewUri = viewUri; + } + + /// + /// The calendar view URI changed. + /// + public string ViewUri + { + get; + internal set; + } + } +} diff --git a/src/Tizen.Sensor/Interop/Interop.Sensor.cs b/src/Tizen.Sensor/Interop/Interop.Sensor.cs index 58a6b1e..160c033 100644 --- a/src/Tizen.Sensor/Interop/Interop.Sensor.cs +++ b/src/Tizen.Sensor/Interop/Interop.Sensor.cs @@ -130,7 +130,7 @@ internal static partial class Interop internal static SensorEventStruct IntPtrToEventStruct(IntPtr unmanagedVariable) { - SensorEventStruct outStruct = (SensorEventStruct)Marshal.PtrToStructure(unmanagedVariable, typeof(SensorEventStruct)); + SensorEventStruct outStruct = (SensorEventStruct)Marshal.PtrToStructure(unmanagedVariable); return outStruct; } } diff --git a/src/Tizen.Sensor/Tizen.Sensor/Plugins/HeartRateMonitor.cs b/src/Tizen.Sensor/Tizen.Sensor/Plugins/HeartRateMonitor.cs index e6c6f48..330628c 100755 --- a/src/Tizen.Sensor/Tizen.Sensor/Plugins/HeartRateMonitor.cs +++ b/src/Tizen.Sensor/Tizen.Sensor/Plugins/HeartRateMonitor.cs @@ -69,7 +69,7 @@ namespace Tizen.Sensor /// http://tizen.org/feature/sensor.heart_rate_monitor /// Thrown when an invalid argument is used. /// Thrown when the sensor is not supported. - /// Thrown when the application has no privilege to use the sensor. + /// Thrown when the application has no privilege to use the sensor. /// Thrown when the operation is invalid for the current state. /// /// Index. Default value for this is 0. Index refers to a particular heart rate monitor in case of multiple sensors. diff --git a/src/Tizen.Sensor/Tizen.Sensor/Plugins/Pedometer.cs b/src/Tizen.Sensor/Tizen.Sensor/Plugins/Pedometer.cs index 2f778f3..4c9c502 100755 --- a/src/Tizen.Sensor/Tizen.Sensor/Plugins/Pedometer.cs +++ b/src/Tizen.Sensor/Tizen.Sensor/Plugins/Pedometer.cs @@ -118,7 +118,7 @@ namespace Tizen.Sensor /// http://tizen.org/feature/sensor.pedometer /// Thrown when an invalid argument is used. /// Thrown when the sensor is not supported. - /// Thrown when the application has no privilege to use the sensor. + /// Thrown when the application has no privilege to use the sensor. /// Thrown when the operation is invalid for the current state. /// /// Index. Default value for this is 0. Index refers to a particular pedometer sensor in case of multiple sensors. diff --git a/src/Tizen.Sensor/Tizen.Sensor/Plugins/SleepMonitor.cs b/src/Tizen.Sensor/Tizen.Sensor/Plugins/SleepMonitor.cs index e9c8578..7ac0b46 100755 --- a/src/Tizen.Sensor/Tizen.Sensor/Plugins/SleepMonitor.cs +++ b/src/Tizen.Sensor/Tizen.Sensor/Plugins/SleepMonitor.cs @@ -69,7 +69,7 @@ namespace Tizen.Sensor /// http://tizen.org/feature/sensor.sleep_monitor /// Thrown when an invalid argument is used. /// Thrown when the sensor is not supported. - /// Thrown when the application has no privilege to use the sensor. + /// Thrown when the application has no privilege to use the sensor. /// Thrown when the operation is invalid for the current state. /// /// Index. Default value for this is 0. Index refers to a particular sleep monitor in case of multiple sensors. diff --git a/src/Tizen.Sensor/Tizen.Sensor/Plugins/StationaryActivityDetector.cs b/src/Tizen.Sensor/Tizen.Sensor/Plugins/StationaryActivityDetector.cs index 74d88c1..79ebddb 100755 --- a/src/Tizen.Sensor/Tizen.Sensor/Plugins/StationaryActivityDetector.cs +++ b/src/Tizen.Sensor/Tizen.Sensor/Plugins/StationaryActivityDetector.cs @@ -61,7 +61,7 @@ namespace Tizen.Sensor } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// 3 /// http://tizen.org/feature/sensor.activity_recognition diff --git a/src/Tizen.Sensor/Tizen.Sensor/Plugins/WalkingActivityDetector.cs b/src/Tizen.Sensor/Tizen.Sensor/Plugins/WalkingActivityDetector.cs index 6e5c162..d2b7906 100755 --- a/src/Tizen.Sensor/Tizen.Sensor/Plugins/WalkingActivityDetector.cs +++ b/src/Tizen.Sensor/Tizen.Sensor/Plugins/WalkingActivityDetector.cs @@ -61,7 +61,7 @@ namespace Tizen.Sensor } /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// 3 /// http://tizen.org/feature/sensor.activity_recognition diff --git a/src/Tizen.System/Device/Battery.cs b/src/Tizen.System/Device/Battery.cs index 6a175d6..9e56825 100755 --- a/src/Tizen.System/Device/Battery.cs +++ b/src/Tizen.System/Device/Battery.cs @@ -133,8 +133,6 @@ namespace Tizen.System /// CapacityChanged is triggered when the battery charge percentage is changed. /// /// 3 - /// - /// BatteryCapacityChangedEventArgs is an object that contains the changed battery capacity (Percent). /// /// public static async Task BatteryEventHandler() /// { @@ -179,8 +177,6 @@ namespace Tizen.System /// LevelChanged is triggered when the battery level is changed. /// /// 3 - /// - /// BatteryLevelChangedEventArgs is an object that contains the changed battery level. /// /// public static async Task BatteryEventHandler() /// { @@ -225,8 +221,6 @@ namespace Tizen.System /// This event is triggered when the charger is connected/disconnected. /// /// 3 - /// - /// BatteryChargingStateChangedEventArgs is an object that contains the changed battery charging state. /// /// public static async Task BatteryEventHandler() /// { diff --git a/src/Tizen.System/Device/Led.cs b/src/Tizen.System/Device/Led.cs index e61118d..7d00ca8 100644 --- a/src/Tizen.System/Device/Led.cs +++ b/src/Tizen.System/Device/Led.cs @@ -168,8 +168,6 @@ namespace Tizen.System /// StateChanged is raised when the LED state is changed. /// /// 3 - /// The source of the event. - /// LedBrightnessChangedEventArgs is an object that contains the changed brightness. public static event EventHandler BrightnessChanged { add diff --git a/src/Tizen.Tracer/Tizen/Tracer.cs b/src/Tizen.Tracer/Tizen/Tracer.cs index 5fffbbb..020c97f 100755 --- a/src/Tizen.Tracer/Tizen/Tracer.cs +++ b/src/Tizen.Tracer/Tizen/Tracer.cs @@ -43,7 +43,7 @@ namespace Tizen /// Tizen.Tracer.End() ends the most recently called Tizen.Tracer.Begin(). /// The specific error code can be obtained using the Tizen.Internals.Errors.ErrorFacts.GetLastResult() method. /// - /// + /// public static void End () { Interop.Tracer.End (); @@ -57,7 +57,7 @@ namespace Tizen /// /// An unique identifier for distinguishing simultaneous events. /// The name of an event (optionally containing format specifiers). - /// + /// public static void AsyncBegin (int cookie, String name) { Interop.Tracer.AsyncBegin (cookie, name); @@ -72,7 +72,7 @@ namespace Tizen /// /// An unique identifier for distinguishing simultaneous events. /// The name of an event (optionally containing format specifiers). - /// + /// public static void AsyncEnd (int cookie, String name) { Interop.Tracer.AsyncEnd (cookie, name); diff --git a/src/Tizen.WebView/Tizen.WebView/Chromium.cs b/src/Tizen.WebView/Tizen.WebView/Chromium.cs index 8511dcd..ca220ed 100644 --- a/src/Tizen.WebView/Tizen.WebView/Chromium.cs +++ b/src/Tizen.WebView/Tizen.WebView/Chromium.cs @@ -16,10 +16,13 @@ namespace Tizen.WebView { + /// + /// This class provides methods to initialize and shutdown Chromium-efl. + /// public static class Chromium { /// - /// Initializes Chromium's instance + /// Initializes Chromium's instance. /// /// A reference count of Chromium's instance public static int Initialize() @@ -28,7 +31,7 @@ namespace Tizen.WebView } /// - /// Decreases a reference count of WebKit's instance, possibly destroying it + /// Decreases a reference count of WebKit's instance, possibly destroying it. /// /// A reference count of Chromium's instance public static int Shutdown() diff --git a/src/Tizen.WebView/Tizen.WebView/Context.cs b/src/Tizen.WebView/Tizen.WebView/Context.cs index 6e58cad..097da62 100644 --- a/src/Tizen.WebView/Tizen.WebView/Context.cs +++ b/src/Tizen.WebView/Tizen.WebView/Context.cs @@ -23,11 +23,27 @@ namespace Tizen.WebView /// public enum CacheModel { - DocumentViewer, /* Use the smallest cache capacity */ - DocumentBrowser, /* Use bigger cache capacity than DocumentBrowser */ - PrimaryWebBrowser /* Use the biggest cache capacity. */ + /// + /// Use the smallest cache capacity. + /// + DocumentViewer, + /// + /// Use bigger cache capacity than DocumentBrowser. + /// + DocumentBrowser, + /// + /// Use the biggest cache capacity. + /// + PrimaryWebBrowser } + /// + /// This class encapsulates all pages related to the specific use of Chromium-efl. + /// + /// + /// Applications have the option of creating a context different from the default one and using it for a group of pages. + /// All pages in the same context share the same preferences, visited link set, local storage, and so on. + /// public class Context { private IntPtr _handle; diff --git a/src/Tizen.WebView/Tizen.WebView/CookieManager.cs b/src/Tizen.WebView/Tizen.WebView/CookieManager.cs index 487e88b..f7ed538 100644 --- a/src/Tizen.WebView/Tizen.WebView/CookieManager.cs +++ b/src/Tizen.WebView/Tizen.WebView/CookieManager.cs @@ -22,9 +22,18 @@ namespace Tizen.WebView /// public enum CookieAcceptPolicy { - Always, /* Accepts every cookie sent from any page */ - Never, /* Rejects all cookies */ - NoThirdParty /* Accepts only cookies set by the main document loaded */ + /// + /// Accepts every cookie sent from any page. + /// + Always, + /// + /// Rejects all cookies. + /// + Never, + /// + /// Accepts only cookies set by the main document loaded. + /// + NoThirdParty } /// @@ -32,10 +41,19 @@ namespace Tizen.WebView /// public enum CookiePersistentStorage { - Text, /* Cookies are stored in a text file in the Mozilla "cookies.txt" format */ - SqlLite /* Cookies are stored in a SQLite file in the current Mozilla format. */ + /// + /// Cookies are stored in a text file in the Mozilla "cookies.txt" format. + /// + Text, + /// + /// Cookies are stored in a SQLite file in the current Mozilla format. + /// + SqlLite } + /// + /// This class provides methods for the cookie manager. + /// public class CookieManager { private IntPtr _handle; @@ -68,10 +86,8 @@ namespace Tizen.WebView /// /// Sets the storage where non-session cookies are stored persistently to read/write the cookies. /// - /// - /// http://tizen.org/privilege/mediastorage - /// http://tizen.org/privilege/externalstorage - /// + /// http://tizen.org/privilege/mediastorage + /// http://tizen.org/privilege/externalstorage /// The path where to read/write Cookies /// The type of storage public void SetPersistentStorage(string path, CookiePersistentStorage storage) diff --git a/src/Tizen.WebView/Tizen.WebView/Settings.cs b/src/Tizen.WebView/Tizen.WebView/Settings.cs index 8e1f349..b9fcba3 100644 --- a/src/Tizen.WebView/Tizen.WebView/Settings.cs +++ b/src/Tizen.WebView/Tizen.WebView/Settings.cs @@ -18,6 +18,9 @@ using System; namespace Tizen.WebView { + /// + /// This class provides properties for setting the preference of a specific WebView. + /// public class Settings { private IntPtr _handle; diff --git a/src/Tizen.WebView/Tizen.WebView/SmartCallbackLoadErrorArgs.cs b/src/Tizen.WebView/Tizen.WebView/SmartCallbackLoadErrorArgs.cs index 8aa6704..28323bb 100644 --- a/src/Tizen.WebView/Tizen.WebView/SmartCallbackLoadErrorArgs.cs +++ b/src/Tizen.WebView/Tizen.WebView/SmartCallbackLoadErrorArgs.cs @@ -33,7 +33,7 @@ namespace Tizen.WebView /// Canceled, /// - /// Can't show page for this MIME Type + /// Can't show page for this MIME Type. /// CantSupportMimetype, /// @@ -41,19 +41,19 @@ namespace Tizen.WebView /// FailedFileIo, /// - /// Cannot connect to network + /// Cannot connect to network. /// CantConnect, /// - /// Fail to look up host from DNS + /// Fail to look up host from DNS. /// CantLookupHost, /// - /// Fail to SSL/TLS handshake + /// Fail to SSL/TLS handshake. /// FailedTlsHandshake, /// - /// Received certificate is invalid + /// Received certificate is invalid. /// InvalidCertificate, /// @@ -81,7 +81,7 @@ namespace Tizen.WebView /// Authentication, /// - /// Web server has internal server error + /// Web server has internal server error. /// InternalServer, } -- 2.7.4