diff options
author | Kyuho Jo <kyuho.jo@samsung.com> | 2015-08-19 17:12:14 +0900 |
---|---|---|
committer | Kyuho Jo <kyuho.jo@samsung.com> | 2015-08-19 22:05:21 +0900 |
commit | ba887a84aa3aa90d5eaf6e324746ec1613d54256 (patch) | |
tree | 65b8851b4b2b6fd77a4a2b99cfa6a27395047a8f /include/notification_type.h | |
parent | b40e50b468f1cb442cb1c01d238b1e313461eb49 (diff) | |
download | notification-ba887a84aa3aa90d5eaf6e324746ec1613d54256.tar.gz notification-ba887a84aa3aa90d5eaf6e324746ec1613d54256.tar.bz2 notification-ba887a84aa3aa90d5eaf6e324746ec1613d54256.zip |
1. Merge latest code from tizen 2.4submit/tizen/20150820.023311
2. Move db file to /usr/dbspace
3. Remove redundant files
Change-Id: I62f24661ea645cd28099821cd0c25552e0d3c9f3
Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>
Diffstat (limited to 'include/notification_type.h')
-rw-r--r-- | include/notification_type.h | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/include/notification_type.h b/include/notification_type.h index 93a1ac1..cddd779 100644 --- a/include/notification_type.h +++ b/include/notification_type.h @@ -144,6 +144,19 @@ typedef enum _notification_count_display_type { } notification_count_display_type_e; /** + * @brief Enumeration for button + * @since_tizen 2.4 + */ +typedef enum _notification_button_index { + NOTIFICATION_BUTTON_1 = 1, /**< button 1 */ + NOTIFICATION_BUTTON_2 = 2, /**< button 2 */ + NOTIFICATION_BUTTON_3 = 3, /**< button 3 */ + NOTIFICATION_BUTTON_4 = 4, /**< button 4 */ + NOTIFICATION_BUTTON_5 = 5, /**< button 5 */ + NOTIFICATION_BUTTON_6 = 6, /**< button 6 */ +} notification_button_index_e; + +/** * @brief Enumeration for notification text type. * @since_tizen @if WEARABLE 2.3.1 @elseif MOBILE 2.3 @endif */ @@ -312,15 +325,12 @@ enum _notification_property { * @since_tizen @if WEARABLE 2.3.1 @elseif MOBILE 2.3 @endif */ enum _notificaton_display_applist { - NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY = 0x00000001,/**< Notification Tray(Quickpanel) */ - NOTIFICATION_DISPLAY_APP_TICKER = 0x00000002, - /**< Ticker notification */ - NOTIFICATION_DISPLAY_APP_LOCK = 0x00000004, - /**< Lock screen */ + NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY = 0x00000001, /**< Notification Tray(Quickpanel) */ + NOTIFICATION_DISPLAY_APP_TICKER = 0x00000002, /**< Ticker notification */ + NOTIFICATION_DISPLAY_APP_LOCK = 0x00000004, /**< Lock screen */ NOTIFICATION_DISPLAY_APP_INDICATOR = 0x00000008,/**< Indicator */ - NOTIFICATION_DISPLAY_APP_HEADS_UP = 0x00000010,/**< Heads-up notification */ - NOTIFICATION_DISPLAY_APP_ALL = 0xffffffff, - /**< All display application */ + NOTIFICATION_DISPLAY_APP_ACTIVE = 0x00000010,/**< Active notification */ + NOTIFICATION_DISPLAY_APP_ALL = 0x0000000f, /**< All display application except active notification*/ }; /** |