summaryrefslogtreecommitdiff
path: root/wearable
diff options
context:
space:
mode:
authorpr.jung <pr.jung@samsung.com>2016-10-24 18:27:38 +0900
committerpr.jung <pr.jung@samsung.com>2016-10-24 19:16:03 +0900
commit4973bfa903175183e1268d82cab8ae9d960e5463 (patch)
tree00a392a37964b68bc8f3d2ef98bcca50fa733a80 /wearable
parente59eb741fa3f899b7ffb64c0da26bd24da46a799 (diff)
downloadlibsvi-4973bfa903175183e1268d82cab8ae9d960e5463.tar.gz
libsvi-4973bfa903175183e1268d82cab8ae9d960e5463.tar.bz2
libsvi-4973bfa903175183e1268d82cab8ae9d960e5463.zip
Remove specific product related enumerations and merge internal enum file
Change-Id: I97576432d199da7bebf1d88068a3846a1580a991 Signed-off-by: pr.jung <pr.jung@samsung.com>
Diffstat (limited to 'wearable')
-rw-r--r--wearable/data/sound.conf25
-rw-r--r--wearable/data/vibration.conf26
-rw-r--r--wearable/include/feedback-ids-wearable.h108
-rw-r--r--wearable/src/check.c155
4 files changed, 70 insertions, 244 deletions
diff --git a/wearable/data/sound.conf b/wearable/data/sound.conf
index f5c9f97..9c94d3a 100644
--- a/wearable/data/sound.conf
+++ b/wearable/data/sound.conf
@@ -22,24 +22,7 @@ FEEDBACK_PATTERN_SILENT_OFF=/usr/share/feedback/sound/operation/system.ogg
FEEDBACK_PATTERN_BT_CONNECTED=/usr/share/feedback/sound/operation/system.ogg
FEEDBACK_PATTERN_BT_DISCONNECTED=/usr/share/feedback/sound/operation/system.ogg
FEEDBACK_PATTERN_VOLUME_KEY=/usr/share/feedback/sound/operation/system.ogg
-FEEDBACK_PATTERN_WEARABLE_SIP_BACKSPACE=/usr/share/feedback/sound/touch/touch.ogg
-FEEDBACK_PATTERN_WEARABLE_SIP_FUNCTION=/usr/share/feedback/sound/touch/touch.ogg
-FEEDBACK_PATTERN_WEARABLE_SIP_FJKEY=/usr/share/feedback/sound/touch/touch.ogg
-FEEDBACK_PATTERN_WEARABLE_WAKEUP_ON_CALL=/usr/share/feedback/sound/operation/notification.ogg
-FEEDBACK_PATTERN_WEARABLE_SCHEDULE_ON_CALL=/usr/share/feedback/sound/operation/notification.ogg
-FEEDBACK_PATTERN_WEARABLE_TIMER_ON_CALL=/usr/share/feedback/sound/operation/notification.ogg
-FEEDBACK_PATTERN_WEARABLE_SAFETY_ALERT=/usr/share/feedback/sound/operation/system.ogg
-FEEDBACK_PATTERN_WEARABLE_CALLCONNECT=/usr/share/feedback/sound/operation/system.ogg
-FEEDBACK_PATTERN_WEARABLE_DISCALLCONNECT=/usr/share/feedback/sound/operation/system.ogg
-FEEDBACK_PATTERN_WEARABLE_BT_PAIRING=/usr/share/feedback/sound/operation/system.ogg
-FEEDBACK_PATTERN_WEARABLE_BT_WAITING=/usr/share/feedback/sound/operation/system.ogg
-FEEDBACK_PATTERN_WEARABLE_SCREEN_CAPTURE=/usr/share/feedback/sound/operation/shutter.ogg
-FEEDBACK_PATTERN_WEARABLE_SAFETY_LOW_POWER=/usr/share/feedback/sound/operation/system.ogg
-FEEDBACK_PATTERN_WEARABLE_CMAS=/usr/share/feedback/sound/operation/system.ogg
-FEEDBACK_PATTERN_WEARABLE_GOAL_ACHIEVED=/usr/share/feedback/sound/operation/system.ogg
-FEEDBACK_PATTERN_WEARABLE_MEASURING_SUCCESS=/usr/share/feedback/sound/operation/system.ogg
-FEEDBACK_PATTERN_WEARABLE_MEASURING_FAILURE=/usr/share/feedback/sound/operation/system.ogg
-FEEDBACK_PATTERN_WEARABLE_UV_PROCESSING=/usr/share/feedback/sound/operation/system.ogg
-FEEDBACK_PATTERN_WEARABLE_SHEALTH_START=/usr/share/feedback/sound/operation/system.ogg
-FEEDBACK_PATTERN_WEARABLE_SHEALTH_PAUSE=/usr/share/feedback/sound/operation/system.ogg
-FEEDBACK_PATTERN_WEARABLE_SHEALTH_STOP=/usr/share/feedback/sound/operation/system.ogg
+FEEDBACK_PATTERN_WAKEUP_ON_CALL=/usr/share/feedback/sound/operation/notification.ogg
+FEEDBACK_PATTERN_SCHEDULE_ON_CALL=/usr/share/feedback/sound/operation/notification.ogg
+FEEDBACK_PATTERN_TIMER_ON_CALL=/usr/share/feedback/sound/operation/notification.ogg
+FEEDBACK_PATTERN_SCREEN_CAPTURE=/usr/share/feedback/sound/operation/shutter.ogg
diff --git a/wearable/data/vibration.conf b/wearable/data/vibration.conf
index a463220..f642a08 100644
--- a/wearable/data/vibration.conf
+++ b/wearable/data/vibration.conf
@@ -13,26 +13,6 @@ FEEDBACK_PATTERN_LOWBATT=100D
FEEDBACK_PATTERN_VIBRATION_ON=100D
FEEDBACK_PATTERN_BT_CONNECTED=100D
FEEDBACK_PATTERN_BT_DISCONNECTED=100D
-FEEDBACK_PATTERN_WEARABLE_SIP_BACKSPACE=100D
-FEEDBACK_PATTERN_WEARABLE_SIP_FUNCTION=100D
-FEEDBACK_PATTERN_WEARABLE_SIP_FJKEY=100D
-FEEDBACK_PATTERN_WEARABLE_CHARGERCONN_ON_CALL=100D
-FEEDBACK_PATTERN_WEARABLE_LOWBATT_ON_CALL=100D
-FEEDBACK_PATTERN_WEARABLE_CALLCONNECT=100D
-FEEDBACK_PATTERN_WEARABLE_DISCALLCONNECT=100D
-FEEDBACK_PATTERN_WEARABLE_BT_PAIRING=100D
-FEEDBACK_PATTERN_WEARABLE_BT_WAITING=100D
-FEEDBACK_PATTERN_WEARABLE_SAFETY_ALERT=100D
-FEEDBACK_PATTERN_WEARABLE_SEND_SOS_MESSAGE=100D
-FEEDBACK_PATTERN_WEARABLE_END_SOS_MESSAGE=100D
-FEEDBACK_PATTERN_WEARABLE_CMAS=100D
-FEEDBACK_PATTERN_WEARABLE_SPEED_UP=100D
-FEEDBACK_PATTERN_WEARABLE_SLOW_DOWN=100D
-FEEDBACK_PATTERN_WEARABLE_KEEP_THIS_PACE=100D
-FEEDBACK_PATTERN_WEARABLE_GOAL_ACHIEVED=100D
-FEEDBACK_PATTERN_WEARABLE_START_CUE=100D
-FEEDBACK_PATTERN_WEARABLE_HEALTH_PACE=100D
-FEEDBACK_PATTERN_WEARABLE_INACTIVE_TIME=100D
-FEEDBACK_PATTERN_WEARABLE_MEASURING_SUCCESS=100D
-FEEDBACK_PATTERN_WEARABLE_MEASURING_FAILURE=100D
-FEEDBACK_PATTERN_WEARABLE_3RD_APPLICATION=100D
+FEEDBACK_PATTERN_CHARGERCONN_ON_CALL=100D
+FEEDBACK_PATTERN_LOWBATT_ON_CALL=100D
+FEEDBACK_PATTERN_SEND_SOS_MESSAGE=100D
diff --git a/wearable/include/feedback-ids-wearable.h b/wearable/include/feedback-ids-wearable.h
deleted file mode 100644
index adb94ef..0000000
--- a/wearable/include/feedback-ids-wearable.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * libfeedback
- * Copyright (c) 2012 Samsung Electronics Co., Ltd.
- *
- * 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.
- */
-
-
-#ifndef __FEEDBACK_IDS_WEARABLE_H__
-#define __FEEDBACK_IDS_WEARABLE_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @file feedback-ids-mobile.h
- * @brief This file contains the feedback API
- */
-
-/**
- * @addtogroup CAPI_FEEDBACK_MODULE
- * @{
- */
-
-/**
- * @brief Enumerations of the system pre-defined patterns for feedback interface
- * @details
- * Each feedback pattern can have separate media files of each types.
- * But Depending on vendor design, pattern may not have any type of file.
- *
- */
-typedef enum {
- FEEDBACK_PATTERN_WEARABLE_NONE = -1,
-
- FEEDBACK_PATTERN_WEARABLE_SIP_BACKSPACE = 2, /**< feedback pattern when touch backspace key */
- FEEDBACK_PATTERN_WEARABLE_SIP_FUNCTION = 3, /**< feedback pattern when touch function key */
- FEEDBACK_PATTERN_WEARABLE_SIP_FJKEY = 4, /**< feedback pattern when touch F,J key */
- FEEDBACK_PATTERN_WEARABLE_MAX_CHARACTER = 5, /**< feedback pattern when max character */
-
- FEEDBACK_PATTERN_WEARABLE_MESSAGE_ON_CALL = 24, /**< feedback pattern when incoming a message on call */
- FEEDBACK_PATTERN_WEARABLE_EMAIL_ON_CALL = 26, /**< feedback pattern when incoming an email on call */
- FEEDBACK_PATTERN_WEARABLE_WAKEUP_ON_CALL = 28, /**< feedback pattern when alert wake up call on call */
- FEEDBACK_PATTERN_WEARABLE_SCHEDULE_ON_CALL = 30, /**< feedback pattern when alert schedule alarm on call */
- FEEDBACK_PATTERN_WEARABLE_TIMER_ON_CALL = 32, /**< feedback pattern when alert timer on call */
- FEEDBACK_PATTERN_WEARABLE_GENERAL_ON_CALL = 34, /**< feedback pattern when alert general event on call */
- FEEDBACK_PATTERN_WEARABLE_SMART_ALERT = 35, /**< feedback pattern when alert noti on motion */
-
- FEEDBACK_PATTERN_WEARABLE_CHARGERCONN_ON_CALL = 39, /**< feedback pattern when connecting charger on call */
- FEEDBACK_PATTERN_WEARABLE_CHARGING_ERROR_ON_CALL = 41,/**< feedback pattern when occuring charging error on call */
- FEEDBACK_PATTERN_WEARABLE_FULLCHARGED_ON_CALL = 43, /**< feedback pattern when full charged on call */
- FEEDBACK_PATTERN_WEARABLE_LOWBATT_ON_CALL = 45, /**< feedback pattern when low battery on call */
- FEEDBACK_PATTERN_WEARABLE_CALLCONNECT = 51, /**< feedback pattern when connecting call */
- FEEDBACK_PATTERN_WEARABLE_DISCALLCONNECT = 52, /**< feedback pattern when disconnecting call */
- FEEDBACK_PATTERN_WEARABLE_OUTGOING_CALL = 53, /**< feedback pattern when connected outgoing call */
- FEEDBACK_PATTERN_WEARABLE_MINUTEMINDER = 54, /**< feedback pattern when minute minder */
- FEEDBACK_PATTERN_WEARABLE_BT_PAIRING = 59, /**< feedback pattern when starting pare with bluetooth */
- FEEDBACK_PATTERN_WEARABLE_BT_WAITING = 60, /**< feedback pattern when pairing bluetooth */
- FEEDBACK_PATTERN_WEARABLE_SCREEN_CAPTURE = 61, /**< feedback pattern when screen capture */
- FEEDBACK_PATTERN_WEARABLE_MMS = 65, /**< feedback pattern when message state changed to MMS */
- FEEDBACK_PATTERN_WEARABLE_HOURLY_ALERT, /**< feedback pattern when alert every hour on the hour */
-
- FEEDBACK_PATTERN_WEARABLE_SAFETY_ALERT, /**< feedback pattern when safety alert from phone */
- FEEDBACK_PATTERN_WEARABLE_ACCIDENT_DETECT, /**< feedback pattern when accident detect */
- FEEDBACK_PATTERN_WEARABLE_SEND_SOS_MESSAGE, /**< feedback pattern when sending SOS message */
- FEEDBACK_PATTERN_WEARABLE_END_SOS_MESSAGE, /**< feedback pattern when finishing SOS message */
- FEEDBACK_PATTERN_WEARABLE_EMERGENCY_BUZZER, /**< feedback pattern when occurs emergency buzzer */
- FEEDBACK_PATTERN_WEARABLE_SAFETY_LOW_POWER, /**< this pattern is a low power ringtone */
- FEEDBACK_PATTERN_WEARABLE_CMAS, /**< feedback pattern when alerting commercial mobile */
- FEEDBACK_PATTERN_WEARABLE_SPEED_UP, /**< feedback pattern when advising user to speed up */
- FEEDBACK_PATTERN_WEARABLE_SLOW_DOWN, /**< feedback pattern when advising user to slow down */
- FEEDBACK_PATTERN_WEARABLE_KEEP_THIS_PACE, /**< feedback pattern when advising user to keep this pace */
- FEEDBACK_PATTERN_WEARABLE_GOAL_ACHIEVED, /**< feedback pattern when alerting goal achieved */
- FEEDBACK_PATTERN_WEARABLE_EXERCISE_COUNT, /**< feedback pattern when changing count number */
- FEEDBACK_PATTERN_WEARABLE_START_CUE, /**< feedback pattern when starting cue */
- FEEDBACK_PATTERN_WEARABLE_HEALTH_PACE, /**< feedback pattern when alerting health pace */
- FEEDBACK_PATTERN_WEARABLE_INACTIVE_TIME, /**< feedback pattern when alerting inactive time */
- FEEDBACK_PATTERN_WEARABLE_MEASURING_SUCCESS, /**< feedback pattern when measuring is succeeded */
- FEEDBACK_PATTERN_WEARABLE_MEASURING_FAILURE, /**< feedback pattern when measuring is failed */
- FEEDBACK_PATTERN_WEARABLE_UV_PROCESSING, /**< feedback pattern when UV is processing */
- FEEDBACK_PATTERN_WEARABLE_SHEALTH_START, /**< feedback pattern when starting s-health */
- FEEDBACK_PATTERN_WEARABLE_SHEALTH_PAUSE, /**< feedback pattern when pausing s-health */
- FEEDBACK_PATTERN_WEARABLE_SHEALTH_STOP, /**< feedback pattern when stoping s-health */
- FEEDBACK_PATTERN_WEARABLE_3RD_APPLICATION, /**< feedback pattern when alert 3rd event */
-
- FEEDBACK_PATTERN_WEARABLE_END,
-
-} feedback_pattern_wearable_e;
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //__FEEDBACK_IDS_WEARABLE_H__
diff --git a/wearable/src/check.c b/wearable/src/check.c
index b0937e1..141d686 100644
--- a/wearable/src/check.c
+++ b/wearable/src/check.c
@@ -20,7 +20,7 @@
#include <vconf.h>
#include "feedback.h"
-#include "feedback-ids-wearable.h"
+#include "feedback-ids-internal.h"
#include "profiles.h"
#include "log.h"
@@ -34,10 +34,10 @@ static const char *wearable_str_type[] = {
static const char *wearable_str_pattern[] = {
"FEEDBACK_PATTERN_TAP",
"FEEDBACK_PATTERN_SIP",
- "FEEDBACK_PATTERN_WEARABLE_SIP_BACKSPACE",
- "FEEDBACK_PATTERN_WEARABLE_SIP_FUNCTION",
- "FEEDBACK_PATTERN_WEARABLE_SIP_FJKEY",
- "FEEDBACK_PATTERN_WEARABLE_MAX_CHARACTER",
+ "",
+ "",
+ "",
+ "",
"FEEDBACK_PATTERN_KEY0",
"FEEDBACK_PATTERN_KEY1",
"FEEDBACK_PATTERN_KEY2",
@@ -57,73 +57,65 @@ static const char *wearable_str_pattern[] = {
"FEEDBACK_PATTERN_HW_HOLD",
"FEEDBACK_PATTERN_MESSAGE",
- "FEEDBACK_PATTERN_WEARABLE_MESSAGE_ON_CALL",
+ "FEEDBACK_PATTERN_MESSAGE_ON_CALL",
"FEEDBACK_PATTERN_EMAIL",
- "FEEDBACK_PATTERN_WEARABLE_EMAIL_ON_CALL",
+ "FEEDBACK_PATTERN_EMAIL_ON_CALL",
"FEEDBACK_PATTERN_WAKEUP",
- "FEEDBACK_PATTERN_WEARABLE_WAKEUP_ON_CALL",
+ "FEEDBACK_PATTERN_WAKEUP_ON_CALL",
"FEEDBACK_PATTERN_SCHEDULE",
- "FEEDBACK_PATTERN_WEARABLE_SCHEDULE_ON_CALL",
+ "FEEDBACK_PATTERN_SCHEDULE_ON_CALL",
"FEEDBACK_PATTERN_TIMER",
- "FEEDBACK_PATTERN_WEARABLE_TIMER_ON_CALL",
+ "FEEDBACK_PATTERN_TIMER_ON_CALL",
"FEEDBACK_PATTERN_GENERAL",
- "FEEDBACK_PATTERN_WEARABLE_GENERAL_ON_CALL",
- "FEEDBACK_PATTERN_WEARABLE_SMART_ALERT",
+ "FEEDBACK_PATTERN_GENERAL_ON_CALL",
+ "",
"FEEDBACK_PATTERN_POWERON",
"FEEDBACK_PATTERN_POWEROFF",
"FEEDBACK_PATTERN_CHARGERCONN",
- "FEEDBACK_PATTERN_WEARABLE_CHARGERCONN_ON_CALL",
+ "FEEDBACK_PATTERN_CHARGERCONN_ON_CALL",
"FEEDBACK_PATTERN_CHARGING_ERROR",
- "FEEDBACK_PATTERN_WEARABLE_CHARGING_ERROR_ON_CALL",
+ "FEEDBACK_PATTERN_CHARGING_ERROR_ON_CALL",
"FEEDBACK_PATTERN_FULLCHARGED",
- "FEEDBACK_PATTERN_WEARABLE_FULLCHARGED_ON_CALL",
+ "FEEDBACK_PATTERN_FULLCHARGED_ON_CALL",
"FEEDBACK_PATTERN_LOWBATT",
- "FEEDBACK_PATTERN_WEARABLE_LOWBATT_ON_CALL",
+ "FEEDBACK_PATTERN_LOWBATT_ON_CALL",
"FEEDBACK_PATTERN_LOCK",
"FEEDBACK_PATTERN_UNLOCK",
"",
"",
"",
- "FEEDBACK_PATTERN_WEARABLE_CALLCONNECT",
- "FEEDBACK_PATTERN_WEARABLE_DISCALLCONNECT",
- "FEEDBACK_PATTERN_WEARABLE_OUTGOING_CALL",
- "FEEDBACK_PATTERN_WEARABLE_MINUTEMINDER",
+ "",
+ "",
+ "",
+ "",
"FEEDBACK_PATTERN_VIBRATION_ON",
"FEEDBACK_PATTERN_SILENT_OFF",
"FEEDBACK_PATTERN_BT_CONNECTED",
"FEEDBACK_PATTERN_BT_DISCONNECTED",
- "FEEDBACK_PATTERN_WEARABLE_BT_PAIRING",
- "FEEDBACK_PATTERN_WEARABLE_BT_WAITING",
- "FEEDBACK_PATTERN_WEARABLE_SCREEN_CAPTURE",
+ "",
+ "",
+ "FEEDBACK_PATTERN_SCREEN_CAPTURE",
"FEEDBACK_PATTERN_LIST_REORDER",
"FEEDBACK_PATTERN_LIST_SLIDER",
"FEEDBACK_PATTERN_VOLUME_KEY",
- "FEEDBACK_PATTERN_WEARABLE_MMS",
- "FEEDBACK_PATTERN_WEARABLE_HOURLY_ALERT",
-
- "FEEDBACK_PATTERN_WEARABLE_SAFETY_ALERT",
- "FEEDBACK_PATTERN_WEARABLE_ACCIDENT_DETECT",
- "FEEDBACK_PATTERN_WEARABLE_SEND_SOS_MESSAGE",
- "FEEDBACK_PATTERN_WEARABLE_END_SOS_MESSAGE",
- "FEEDBACK_PATTERN_WEARABLE_EMERGENCY_BUZZER",
- "FEEDBACK_PATTERN_WEARABLE_SAFETY_LOW_POWER",
- "FEEDBACK_PATTERN_WEARABLE_CMAS",
- "FEEDBACK_PATTERN_WEARABLE_SPEED_UP",
- "FEEDBACK_PATTERN_WEARABLE_SLOW_DOWN",
- "FEEDBACK_PATTERN_WEARABLE_KEEP_THIS_PACE",
- "FEEDBACK_PATTERN_WEARABLE_GOAL_ACHIEVED",
- "FEEDBACK_PATTERN_WEARABLE_EXERCISE_COUNT",
- "FEEDBACK_PATTERN_WEARABLE_START_CUE",
- "FEEDBACK_PATTERN_WEARABLE_HEALTH_PACE",
- "FEEDBACK_PATTERN_WEARABLE_INACTIVE_TIME",
- "FEEDBACK_PATTERN_WEARABLE_MEASURING_SUCCESS",
- "FEEDBACK_PATTERN_WEARABLE_MEASURING_FAILURE",
- "FEEDBACK_PATTERN_WEARABLE_UV_PROCESSING",
- "FEEDBACK_PATTERN_WEARABLE_SHEALTH_START",
- "FEEDBACK_PATTERN_WEARABLE_SHEALTH_PAUSE",
- "FEEDBACK_PATTERN_WEARABLE_SHEALTH_STOP",
- "FEEDBACK_PATTERN_WEARABLE_3RD_APPLICATION",
+
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "FEEDBACK_PATTERN_SEND_SOS_MESSAGE",
+ "FEEDBACK_PATTERN_RINGER",
+ "FEEDBACK_PATTERN_NOTIFICATION",
+ "FEEDBACK_PATTERN_INFO",
+ "FEEDBACK_PATTERN_WARNING",
+ "FEEDBACK_PATTERN_ERROR",
+ "FEEDBACK_PATTERN_EMERGENCY",
};
static int callstatus;
@@ -226,25 +218,25 @@ static bool wearable_get_switched_pattern(int pattern, int *switched)
/* in case of call connected or connecting */
_D("Call status is connected or connecting.");
if (pattern == FEEDBACK_PATTERN_MESSAGE)
- *switched = FEEDBACK_PATTERN_WEARABLE_MESSAGE_ON_CALL;
+ *switched = FEEDBACK_PATTERN_MESSAGE_ON_CALL;
else if (pattern == FEEDBACK_PATTERN_EMAIL)
- *switched = FEEDBACK_PATTERN_WEARABLE_EMAIL_ON_CALL;
+ *switched = FEEDBACK_PATTERN_EMAIL_ON_CALL;
else if (pattern == FEEDBACK_PATTERN_WAKEUP)
- *switched = FEEDBACK_PATTERN_WEARABLE_WAKEUP_ON_CALL;
+ *switched = FEEDBACK_PATTERN_WAKEUP_ON_CALL;
else if (pattern == FEEDBACK_PATTERN_SCHEDULE)
- *switched = FEEDBACK_PATTERN_WEARABLE_SCHEDULE_ON_CALL;
+ *switched = FEEDBACK_PATTERN_SCHEDULE_ON_CALL;
else if (pattern == FEEDBACK_PATTERN_TIMER)
- *switched = FEEDBACK_PATTERN_WEARABLE_TIMER_ON_CALL;
+ *switched = FEEDBACK_PATTERN_TIMER_ON_CALL;
else if (pattern == FEEDBACK_PATTERN_GENERAL)
- *switched = FEEDBACK_PATTERN_WEARABLE_GENERAL_ON_CALL;
+ *switched = FEEDBACK_PATTERN_GENERAL_ON_CALL;
else if (pattern == FEEDBACK_PATTERN_CHARGERCONN)
- *switched = FEEDBACK_PATTERN_WEARABLE_CHARGERCONN_ON_CALL;
+ *switched = FEEDBACK_PATTERN_CHARGERCONN_ON_CALL;
else if (pattern == FEEDBACK_PATTERN_CHARGING_ERROR)
- *switched = FEEDBACK_PATTERN_WEARABLE_CHARGING_ERROR_ON_CALL;
+ *switched = FEEDBACK_PATTERN_CHARGING_ERROR_ON_CALL;
else if (pattern == FEEDBACK_PATTERN_FULLCHARGED)
- *switched = FEEDBACK_PATTERN_WEARABLE_FULLCHARGED_ON_CALL;
+ *switched = FEEDBACK_PATTERN_FULLCHARGED_ON_CALL;
else if (pattern == FEEDBACK_PATTERN_LOWBATT)
- *switched = FEEDBACK_PATTERN_WEARABLE_LOWBATT_ON_CALL;
+ *switched = FEEDBACK_PATTERN_LOWBATT_ON_CALL;
else
return false;
@@ -260,9 +252,6 @@ static bool wearable_get_always_alert_case(int type, int pattern)
return true;
break;
case FEEDBACK_PATTERN_SIP:
- case FEEDBACK_PATTERN_WEARABLE_SIP_BACKSPACE:
- case FEEDBACK_PATTERN_WEARABLE_SIP_FUNCTION:
- case FEEDBACK_PATTERN_WEARABLE_SIP_FJKEY:
if (CHECK_VIBRATION(type))
return true;
break;
@@ -272,48 +261,31 @@ static bool wearable_get_always_alert_case(int type, int pattern)
return true;
break;
case FEEDBACK_PATTERN_TIMER:
- case FEEDBACK_PATTERN_WEARABLE_TIMER_ON_CALL:
+ case FEEDBACK_PATTERN_TIMER_ON_CALL:
if (CHECK_VIBRATION(type))
return true;
break;
case FEEDBACK_PATTERN_WAKEUP:
- case FEEDBACK_PATTERN_WEARABLE_WAKEUP_ON_CALL:
+ case FEEDBACK_PATTERN_WAKEUP_ON_CALL:
return true;
- case FEEDBACK_PATTERN_WEARABLE_MESSAGE_ON_CALL:
- case FEEDBACK_PATTERN_WEARABLE_EMAIL_ON_CALL:
- case FEEDBACK_PATTERN_WEARABLE_GENERAL_ON_CALL:
+ case FEEDBACK_PATTERN_MESSAGE_ON_CALL:
+ case FEEDBACK_PATTERN_EMAIL_ON_CALL:
+ case FEEDBACK_PATTERN_GENERAL_ON_CALL:
break;
- case FEEDBACK_PATTERN_WEARABLE_CHARGERCONN_ON_CALL:
- case FEEDBACK_PATTERN_WEARABLE_CHARGING_ERROR_ON_CALL:
- case FEEDBACK_PATTERN_WEARABLE_LOWBATT_ON_CALL:
- case FEEDBACK_PATTERN_WEARABLE_3RD_APPLICATION:
- case FEEDBACK_PATTERN_WEARABLE_MMS:
- case FEEDBACK_PATTERN_WEARABLE_HOURLY_ALERT:
+ case FEEDBACK_PATTERN_CHARGERCONN_ON_CALL:
+ case FEEDBACK_PATTERN_CHARGING_ERROR_ON_CALL:
+ case FEEDBACK_PATTERN_LOWBATT_ON_CALL:
/* no matter sound profile */
if (CHECK_VIBRATION(type))
return true;
break;
- case FEEDBACK_PATTERN_WEARABLE_SMART_ALERT:
- case FEEDBACK_PATTERN_WEARABLE_SEND_SOS_MESSAGE:
- case FEEDBACK_PATTERN_WEARABLE_END_SOS_MESSAGE:
- case FEEDBACK_PATTERN_WEARABLE_CMAS:
- case FEEDBACK_PATTERN_WEARABLE_OUTGOING_CALL:
+ case FEEDBACK_PATTERN_SEND_SOS_MESSAGE:
+ case FEEDBACK_PATTERN_OUTGOING_CALL:
return true;
- case FEEDBACK_PATTERN_WEARABLE_SCREEN_CAPTURE:
+ case FEEDBACK_PATTERN_SCREEN_CAPTURE:
if (CHECK_SOUND(type) && camerastatus && shutter_sndstatus)
return true;
break;
- case FEEDBACK_PATTERN_WEARABLE_SPEED_UP:
- case FEEDBACK_PATTERN_WEARABLE_SLOW_DOWN:
- case FEEDBACK_PATTERN_WEARABLE_KEEP_THIS_PACE:
- case FEEDBACK_PATTERN_WEARABLE_GOAL_ACHIEVED:
- case FEEDBACK_PATTERN_WEARABLE_EXERCISE_COUNT:
- case FEEDBACK_PATTERN_WEARABLE_START_CUE:
- /* except mute case */
- if (CHECK_VIBRATION(type) &&
- (is_sound_mode() || is_vibration_mode()))
- return true;
- break;
default:
break;
}
@@ -338,7 +310,6 @@ static bool wearable_get_always_off_case(int type, int pattern)
switch (pattern) {
case FEEDBACK_PATTERN_TAP ... FEEDBACK_PATTERN_SIP:
case FEEDBACK_PATTERN_HOLD ... FEEDBACK_PATTERN_HW_HOLD:
- case FEEDBACK_PATTERN_WEARABLE_SIP_BACKSPACE ... FEEDBACK_PATTERN_WEARABLE_MAX_CHARACTER:
if (CHECK_SOUND(type) && !is_touch_sndstatus())
return true;
break;
@@ -363,7 +334,7 @@ static int wearable_get_strength_type(int type, int pattern)
return VOLUME_TYPE_SYSTEM|VOLUME_GAIN_DIALER;
else if (pattern == FEEDBACK_PATTERN_VOLUME_KEY)
return VOLUME_TYPE_RINGTONE;
- else if (camerastatus && shutter_sndstatus && pattern == FEEDBACK_PATTERN_WEARABLE_SCREEN_CAPTURE)
+ else if (camerastatus && shutter_sndstatus && pattern == FEEDBACK_PATTERN_SCREEN_CAPTURE)
return VOLUME_TYPE_FIXED;
else
return VOLUME_TYPE_SYSTEM;
@@ -387,7 +358,7 @@ static const struct profile_ops wearable_profile_ops = {
.get_always_off_case = wearable_get_always_off_case,
.get_strength_type = wearable_get_strength_type,
.max_type = FEEDBACK_TYPE_END,
- .max_pattern = FEEDBACK_PATTERN_WEARABLE_END,
+ .max_pattern = FEEDBACK_PATTERN_INTERNAL_END,
.str_type = wearable_str_type,
.str_pattern = wearable_str_pattern,
};