diff options
author | Myungki Lee <mk5004.lee@samsung.com> | 2017-05-12 15:02:56 +0900 |
---|---|---|
committer | Son seungha <seungha.son@samsung.com> | 2017-05-15 05:36:31 +0000 |
commit | 8eee4fe3648080f53e2305d52462708e50881475 (patch) | |
tree | 44bf8880b9f8d97ec1ea184dc2ced5c83a91bc2c | |
parent | 273ef49d18da57e1cfdcf254552ca368a9e5a3c2 (diff) | |
download | application-8eee4fe3648080f53e2305d52462708e50881475.tar.gz application-8eee4fe3648080f53e2305d52462708e50881475.tar.bz2 application-8eee4fe3648080f53e2305d52462708e50881475.zip |
Remove bigpicture related content
Change-Id: I0c9cc104bddc425d44814131278e76e33069fadf
Signed-off-by: Myungki Lee <mk5004.lee@samsung.com>
9 files changed, 2 insertions, 216 deletions
diff --git a/Tizen.Applications.Notification/Interop/Interop.Notification.cs b/Tizen.Applications.Notification/Interop/Interop.Notification.cs index 6d1165e..7dd5365 100755 --- a/Tizen.Applications.Notification/Interop/Interop.Notification.cs +++ b/Tizen.Applications.Notification/Interop/Interop.Notification.cs @@ -203,12 +203,6 @@ internal static partial class Interop [DllImport(Libraries.Notification, EntryPoint = "notification_set_delete_timeout")] internal static extern NotificationError SetDeleteTime(NotificationSafeHandle handle, int timeout); - [DllImport(Libraries.Notification, EntryPoint = "notification_set_extension_image_size")] - internal static extern NotificationError SetBigPictureSize(NotificationSafeHandle handle, int size); - - [DllImport(Libraries.Notification, EntryPoint = "notification_get_extension_image_size")] - internal static extern NotificationError GetBigPictureSize(NotificationSafeHandle handle, out int size); - [DllImport(Libraries.Notification, EntryPoint = "notification_set_extention_data")] internal static extern NotificationError SetExtentionData(NotificationSafeHandle handle, string key, SafeBundleHandle bundleHandle); diff --git a/Tizen.Applications.Notification/Tizen.Applications.Notifications/Notification.cs b/Tizen.Applications.Notification/Tizen.Applications.Notifications/Notification.cs index 6ea56b6..ec7202a 100755 --- a/Tizen.Applications.Notification/Tizen.Applications.Notifications/Notification.cs +++ b/Tizen.Applications.Notification/Tizen.Applications.Notifications/Notification.cs @@ -498,7 +498,6 @@ namespace Tizen.Applications.Notifications IndicatorBinder.BindSafeHandle(this); ActiveBinder.BindSafeHandle(this); LockBinder.BindSafehandle(this); - BigPictureBinder.BindSafeHandle(this); return this; } diff --git a/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationBigPictureStyle.cs b/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationBigPictureStyle.cs deleted file mode 100755 index 416405c..0000000 --- a/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationBigPictureStyle.cs +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2017 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. - */ - -namespace Tizen.Applications.Notifications -{ - /// <summary> - /// Class containing common properties and methods of Notifications - /// </summary> - /// <remarks> - /// A notification is a message that is displayed on the notification area. - /// It is created to notify information to the user through the application. - /// This class helps you to provide method and property for creating notification object. - /// </remarks> - public sealed partial class Notification - { - /// <summary> - /// Class for generating BigPicture style notification - /// </summary> - public sealed class BigPictureStyle : StyleBase - { - /// <summary> - /// Gets or sets the absolute path for a big picture image file to display on BigPicture style of the notification. - /// </summary> - public string ImagePath { get; set; } - - /// <summary> - /// Gets or sets the absolute path for a big picture image size to display on BigPicture style of the notification. - /// </summary> - /// <value> - /// This value is only height size. - /// </value>> - public int ImageSize { get; set; } - - /// <summary> - /// Gets or sets the content text to display on BigPicture style of the notification. - /// </summary> - public string Content { get; set; } - - /// <summary> - /// Gets the key of BigPictureStyle - /// </summary> - internal override string Key - { - get - { - return "BigPicture"; - } - } - - internal override void Make(Notification notification) - { - BigPictureBinder.BindObject(notification); - } - } - } -}
\ No newline at end of file diff --git a/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationEnumerations.cs b/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationEnumerations.cs index 162e032..7cb41d9 100755 --- a/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationEnumerations.cs +++ b/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationEnumerations.cs @@ -180,7 +180,6 @@ namespace Tizen.Applications.Notifications ThirdButton = 15, PlaceHolder = 19, InputButton = 20, - BigPicture = 21, } internal enum NotificationImage @@ -196,7 +195,6 @@ namespace Tizen.Applications.Notifications SecondButton, ThirdButton, TextInputButton = 18, - BigPicture = 19, } internal enum LaunchOption diff --git a/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationStyleBinder.cs b/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationStyleBinder.cs index dbb66f7..8c5014b 100755 --- a/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationStyleBinder.cs +++ b/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationStyleBinder.cs @@ -250,41 +250,4 @@ namespace Tizen.Applications.Notifications } } } - - internal static class BigPictureBinder - { - internal static void BindObject(Notification notification) - { - Notification.BigPictureStyle style = (Notification.BigPictureStyle)notification.GetStyle("BigPicture"); - - Interop.Notification.SetImage(notification.Handle, NotificationImage.BigPicture, style.ImagePath); - Interop.Notification.SetBigPictureSize(notification.Handle, style.ImageSize); - Interop.Notification.SetText(notification.Handle, NotificationText.BigPicture, style.Content, null, -1); - Interop.Notification.SetLayout(notification.Handle, NotificationLayout.Extension); - } - - internal static void BindSafeHandle(Notification notification) - { - NotificationLayout layout; - - Interop.Notification.GetLayout(notification.Handle, out layout); - if (layout == NotificationLayout.Extension) - { - Notification.BigPictureStyle style = new Notification.BigPictureStyle(); - - string text; - Interop.Notification.GetImage(notification.Handle, NotificationImage.BigPicture, out text); - style.ImagePath = text; - - int size; - Interop.Notification.GetBigPictureSize(notification.Handle, out size); - style.ImageSize = size; - - Interop.Notification.GetText(notification.Handle, NotificationText.BigPicture, out text); - style.Content = text; - - notification.AddStyle(style); - } - } - } } diff --git a/Tizen.Applications.NotificationEventListener/Interop/Interop.NotificationEventListener.cs b/Tizen.Applications.NotificationEventListener/Interop/Interop.NotificationEventListener.cs index badb7ac..3e38220 100755 --- a/Tizen.Applications.NotificationEventListener/Interop/Interop.NotificationEventListener.cs +++ b/Tizen.Applications.NotificationEventListener/Interop/Interop.NotificationEventListener.cs @@ -87,9 +87,6 @@ internal static partial class Interop [DllImport(Libraries.NotificationEventListener, EntryPoint = "notification_get_text_input_max_length")] internal static extern ErrorCode GetPlaceHolderLength(SafeNotificationHandle handle, out int max); - [DllImport(Libraries.NotificationEventListener, EntryPoint = "notification_get_extension_image_size")] - internal static extern ErrorCode GetBigPictureSize(SafeNotificationHandle handle, out int size); - [DllImport(Libraries.NotificationEventListener, EntryPoint = "notification_get_launch_option")] internal static extern ErrorCode GetAppControl(SafeNotificationHandle handle, LaunchOption type, out SafeAppControlHandle appControlHandle); diff --git a/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationEventArgsBigPictureStyle.cs b/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationEventArgsBigPictureStyle.cs deleted file mode 100755 index eb8f494..0000000 --- a/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationEventArgsBigPictureStyle.cs +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2017 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. - */ - -namespace Tizen.Applications.NotificationEventListener -{ - /// <summary> - /// This class provides the methods and properties to get information about the posted or updated notification. - /// </summary> - public partial class NotificationEventArgs - { - /// <summary> - /// Class to get infomation about Notification BigPticture style. - /// </summary> - public class BigPictureStyleArgs : StyleArgs - { - /// <summary> - /// Gets the path of the image file to display on the image of BigPicture style. - /// </summary> - public string ImagePath { get; internal set; } - - /// <summary> - /// Gets the size image to display on the image of BigPicture style. - /// </summary> - public int ImageSize { get; internal set; } - - /// <summary> - /// Gets the content to display BigPicture style. - /// </summary> - public string Content { get; internal set; } - - internal override string Key - { - get - { - return "BigPicture"; - } - } - } - } -} diff --git a/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationEventArgsEnumerations.cs b/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationEventArgsEnumerations.cs index 531c2f7..3bd4bb3 100755 --- a/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationEventArgsEnumerations.cs +++ b/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationEventArgsEnumerations.cs @@ -246,11 +246,6 @@ namespace Tizen.Applications.NotificationEventListener /// Text on button the on message reply box /// </summary> InputButton = 20, - - /// <summary> - /// Content for extended notification - /// </summary> - ContentExtension = 21, } /// <summary> @@ -312,11 +307,6 @@ namespace Tizen.Applications.NotificationEventListener /// Image for message reply /// </summary> TextInputButton = 18, - - /// <summary> - /// Image for extended notification - /// </summary> - BigPicture = 19, } /// <summary> @@ -348,11 +338,6 @@ namespace Tizen.Applications.NotificationEventListener /// Layout for ongoing notification. Used to display progress /// </summary> OngoingProgress = 5, - - /// <summary> - /// Layout for extended notification - /// </summary> - Extension = 6 } /// <summary> diff --git a/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationStyleArgsBinder.cs b/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationStyleArgsBinder.cs index ccb4616..fb94bec 100755 --- a/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationStyleArgsBinder.cs +++ b/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationStyleArgsBinder.cs @@ -23,9 +23,7 @@ namespace Tizen.Applications.NotificationEventListener bool autoRemove; string path; int styleList; - int size; int timeout; - NotificationLayout layout; Interop.NotificationEventListener.GetStyleList(eventargs.Handle, out styleList); @@ -77,32 +75,6 @@ namespace Tizen.Applications.NotificationEventListener Interop.NotificationEventListener.GetText(eventargs.Handle, NotificationText.FirstMainText, out path); indicatorStyle.SubText = path; } - - Interop.NotificationEventListener.GetLayout(eventargs.Handle, out layout); - if (layout == NotificationLayout.Extension) - { - NotificationEventArgs.BigPictureStyleArgs bigpictureStyle = new NotificationEventArgs.BigPictureStyleArgs(); - - Interop.NotificationEventListener.GetImage(eventargs.Handle, NotificationImage.BigPicture, out path); - if (string.IsNullOrEmpty(path) == false) - { - bigpictureStyle.ImagePath = path; - } - - Interop.NotificationEventListener.GetBigPictureSize(eventargs.Handle, out size); - if (size > 0) - { - bigpictureStyle.ImageSize = size; - } - - Interop.NotificationEventListener.GetText(eventargs.Handle, NotificationText.ContentExtension, out path); - if (string.IsNullOrEmpty(path) == false) - { - bigpictureStyle.Content = path; - } - - eventargs.Style.Add(bigpictureStyle.Key, bigpictureStyle); - } - } + } } -}
\ No newline at end of file +} |