diff options
author | Praveen Gattu <gattu.p@samsung.com> | 2016-06-07 16:04:49 +0530 |
---|---|---|
committer | Praveen Gattu <gattu.p@samsung.com> | 2016-06-07 16:08:47 +0530 |
commit | bafe224cc648d50ebc65c7a3cc1cf27c32b2ed69 (patch) | |
tree | 920d4632cb502ef005a2d638a33325f0d29c5ba5 | |
parent | c5e339ed931d9a7667ab68ba1fc6a73566cb5f96 (diff) | |
download | system-bafe224cc648d50ebc65c7a3cc1cf27c32b2ed69.tar.gz system-bafe224cc648d50ebc65c7a3cc1cf27c32b2ed69.tar.bz2 system-bafe224cc648d50ebc65c7a3cc1cf27c32b2ed69.zip |
Fixed latest review comments.
Change-Id: I11e2948222dcefabb687c9c59095bfeaf2ff084e
Signed-off-by: Praveen Gattu <gattu.p@samsung.com>
-rwxr-xr-x | Tizen.System/Device/Battery.cs | 26 | ||||
-rw-r--r-- | Tizen.System/Device/DeviceEventArgs.cs | 4 | ||||
-rw-r--r-- | Tizen.System/Interop/Interop.Device.cs | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/Tizen.System/Device/Battery.cs b/Tizen.System/Device/Battery.cs index f26dba5..5d4f127 100755 --- a/Tizen.System/Device/Battery.cs +++ b/Tizen.System/Device/Battery.cs @@ -52,12 +52,12 @@ namespace Tizen.System /// </summary> /// <value>It returns an integer value from 0 to 100 that indicates remaining /// battery charge as a percentage of the maximum level.</value> - public static int Capacity + public static int Percent { get { int percent = 0; - DeviceError res = (DeviceError) Interop.Device.DeviceBatteryGetPercent(out percent); + DeviceError res = (DeviceError)Interop.Device.DeviceBatteryGetPercent(out percent); if (res != DeviceError.None) { Log.Warn(DeviceExceptionFactory.LogTag, "unable to get battery percentage."); @@ -73,7 +73,7 @@ namespace Tizen.System get { int level = 0; - DeviceError res = (DeviceError) Interop.Device.DeviceBatteryGetLevelStatus(out level); + DeviceError res = (DeviceError)Interop.Device.DeviceBatteryGetLevelStatus(out level); if (res != DeviceError.None) { Log.Warn(DeviceExceptionFactory.LogTag, "unable to get battery status."); @@ -89,7 +89,7 @@ namespace Tizen.System get { bool charging; - DeviceError res = (DeviceError) Interop.Device.DeviceBatteryIsCharging(out charging); + DeviceError res = (DeviceError)Interop.Device.DeviceBatteryIsCharging(out charging); if (res != DeviceError.None) { Log.Warn(DeviceExceptionFactory.LogTag, "unable to get battery charging state."); @@ -98,14 +98,14 @@ namespace Tizen.System } } - private static EventHandler<BatteryCapacityChangedEventArgs> s_capacityChanged; + private static EventHandler<BatteryPercentChangedEventArgs> s_capacityChanged; /// <summary> /// CapacityChanged is triggered when the battery charge percentage is changed /// </summary> /// <param name="sender"></param> /// <param name="e">A BatteryCapacityChangedEventArgs object that contains changed battery capacity</param> - public static event EventHandler<BatteryCapacityChangedEventArgs> CapacityChanged + public static event EventHandler<BatteryPercentChangedEventArgs> PercentChanged { add { @@ -113,7 +113,7 @@ namespace Tizen.System { if (s_capacityChanged == null) { - EventListenerStart(EventType.BatteryCapacity); + EventListenerStart(EventType.BatteryPercent); } s_capacityChanged += value; } @@ -125,7 +125,7 @@ namespace Tizen.System s_capacityChanged -= value; if (s_capacityChanged == null) { - EventListenerStop(EventType.BatteryCapacity); + EventListenerStop(EventType.BatteryPercent); } } } @@ -171,7 +171,7 @@ namespace Tizen.System /// <param name="sender"></param> /// <param name="e">A BatteryChargingStateChangedEventArgs object that contains changed battery charging state</param> - public static event EventHandler<BatteryChargingStateChangedEventArgs> ChargingStatusChanged + public static event EventHandler<BatteryChargingStateChangedEventArgs> ChargingStateChanged { add { @@ -205,13 +205,13 @@ namespace Tizen.System { switch (eventType) { - case EventType.BatteryCapacity: + case EventType.BatteryPercent: s_cpacityHandler = (int type, IntPtr value, IntPtr data) => { int val = value.ToInt32(); - BatteryCapacityChangedEventArgs e = new BatteryCapacityChangedEventArgs() + BatteryPercentChangedEventArgs e = new BatteryPercentChangedEventArgs() { - Capacity = val + Percent = val }; s_capacityChanged?.Invoke(null, e); return true; @@ -255,7 +255,7 @@ namespace Tizen.System { switch (eventType) { - case EventType.BatteryCapacity: + case EventType.BatteryPercent: Interop.Device.DeviceRemoveCallback(eventType, s_cpacityHandler); break; diff --git a/Tizen.System/Device/DeviceEventArgs.cs b/Tizen.System/Device/DeviceEventArgs.cs index 6812c39..0ea028f 100644 --- a/Tizen.System/Device/DeviceEventArgs.cs +++ b/Tizen.System/Device/DeviceEventArgs.cs @@ -3,13 +3,13 @@ using System; namespace Tizen.System { // Battery - public class BatteryCapacityChangedEventArgs : EventArgs + public class BatteryPercentChangedEventArgs : EventArgs { /// <summary> /// The current capacity of the battery. /// Capacity is an integer value from 0 to 100, that indicates remaining battery charge as a percentage of the maximum level. /// </summary> - public int Capacity { get; internal set; } + public int Percent { get; internal set; } } public class BatteryLevelChangedEventArgs : EventArgs diff --git a/Tizen.System/Interop/Interop.Device.cs b/Tizen.System/Interop/Interop.Device.cs index 69644b4..efb2e94 100644 --- a/Tizen.System/Interop/Interop.Device.cs +++ b/Tizen.System/Interop/Interop.Device.cs @@ -14,7 +14,7 @@ namespace Tizen.System { internal enum EventType { - BatteryCapacity, + BatteryPercent, BatteryLevel, BatteryCharging, DisplayState, |