Update volume icon and modify sound_type logic

Change-Id: I97329d66d86300d355073e30b70616b25c030035

diff --git a/inc/control.h b/inc/control.h
index 8430f7e..85b295f 100755 (executable)
--- a/inc/control.h
+++ b/inc/control.h
@@ -40,7 +40,6 @@ extern Eina_Bool volume_control_get_safety_limit();
 extern Eina_Bool volume_control_get_time_for_safety_limit();
 extern void volume_control_set_time_for_safety_limit();
 
-extern bundle *volume_control_reset_get_bundle(void);
 extern Eina_Bool volume_control_get_is_deleting(void);
 extern Eina_Bool volume_control_get_is_launching(void);
 extern int volume_control_get_current_angle(void);

diff --git a/inc/main.h b/inc/main.h
index 425b538..c4c0357 100755 (executable)
--- a/inc/main.h
+++ b/inc/main.h
@@ -36,18 +36,19 @@
 
 #define EDJ_APP EDJ_DIR"/volume_app.edj"
 
-#define IMG_VOLUME_ICON "00_volume_icon.png"
-#define IMG_VOLUME_ICON_CALL "00_volume_icon_call.png"
-#define IMG_VOLUME_ICON_MUTE "00_volume_icon_mute.png"
-#define IMG_VOLUME_ICON_VIB "00_volume_icon_vibrat.png"
-#define IMG_VOLUME_ICON_NOTI "00_volume_icon_notification.png"
-#define IMG_VOLUME_ICON_NOTI_VIB "00_volume_icon_notification_vibrate.png"
-#define IMG_VOLUME_ICON_NOTI_MUTE "00_volume_icon_notification_mute.png"
+#define IMG_VOLUME_ICON "sound_slider_icon_volume.png"
+#define IMG_VOLUME_ICON_VIB "sound_slider_icon_volume_vibrate.png"
+#define IMG_VOLUME_ICON_MUTE "sound_slider_icon_volume_mute.png"
+#define IMG_VOLUME_ICON_NOTI "sound_slider_icon_notification.png"
+#define IMG_VOLUME_ICON_NOTI_VIB "sound_slider_icon_notification_vibrate.png"
+#define IMG_VOLUME_ICON_NOTI_MUTE "sound_slider_icon_notification_mute.png"
 #define IMG_VOLUME_ICON_HEADPHONE "00_volume_icon_headphone.png"
-#define IMG_VOLUME_ICON_MEDIA "00_volume_icon_media.png"
-#define IMG_VOLUME_ICON_SETTINGS "00_volume_icon_settings.png"
+#define IMG_VOLUME_ICON_CALL "sound_slider_icon_incoming_call.png"
+#define IMG_VOLUME_ICON_SYSTEM "sound_slider_icon_system"
+#define IMG_VOLUME_ICON_SYSTEM_VIB "sound_slider_icon_system_vibrate"
+#define IMG_VOLUME_ICON_SYSTEM_MUTE "sound_slider_icon_system_mute"
+#define IMG_VOLUME_ICON_SETTINGS "sound_volume_ic_setting.png"
 #define IMG_VOLUME_ICON_SETTINGS_PRESSED "00_volume_icon_settings_pressed.png"
-#define IMG_VOLUME_ICON_SETTINGS_DISABLED "00_volume_icon_settings_disabled.png"
 
 #define _EDJ(x) elm_layout_edje_get(x)
 #define _X(x) (x) / elm_app_base_scale_get() * elm_config_scale_get()

diff --git a/res/edje/volume_app.edc b/res/edje/volume_app.edc
index 0f6750f..3ee4642 100755 (executable)
--- a/res/edje/volume_app.edc
+++ b/res/edje/volume_app.edc
@@ -211,24 +211,25 @@ color_class: "B0563L1P"; \*/
 
 collections {
 
-RESOURCE_IMAGE("00_volume_icon.png");
-RESOURCE_IMAGE("00_volume_icon_call.png");
-RESOURCE_IMAGE("00_volume_icon_mute.png");
-RESOURCE_IMAGE("00_volume_icon_vibrat.png");
-RESOURCE_IMAGE("00_volume_icon_headphone.png");
-RESOURCE_IMAGE("00_volume_icon_media.png");
-RESOURCE_IMAGE("00_volume_icon_notification.png");
-RESOURCE_IMAGE("00_volume_icon_notification_vibrate.png");
-RESOURCE_IMAGE("00_volume_icon_notification_mute.png");
-RESOURCE_IMAGE("00_volume_icon_settings.png");
-RESOURCE_IMAGE_DIM("00_volume_icon_settings_disabled.png");
-RESOURCE_IMAGE_PRESS("00_volume_icon_settings_pressed.png");
+RESOURCE_IMAGE(sound_slider_icon_volume.png);
+RESOURCE_IMAGE(sound_slider_icon_volume_vibrate.png);
+RESOURCE_IMAGE(sound_slider_icon_volume_mute.png);
+RESOURCE_IMAGE(sound_slider_icon_notification.png);
+RESOURCE_IMAGE(sound_slider_icon_notification_vibrate.png);
+RESOURCE_IMAGE(sound_slider_icon_notification_mute.png);
+RESOURCE_IMAGE(00_volume_icon_headphone.png);
+RESOURCE_IMAGE(sound_slider_icon_incoming_call.png);
+RESOURCE_IMAGE(sound_slider_icon_system.png);
+RESOURCE_IMAGE(sound_slider_icon_system_vibrate.png);
+RESOURCE_IMAGE(sound_slider_icon_system_mute.png);
+RESOURCE_IMAGE(sound_volume_ic_setting.png);
+RESOURCE_IMAGE(00_volume_icon_settings_pressed.png);
 
        group {
                name : "volume_layout";
                images {
-                       image: "00_popup_bubble_bg.#.png" COMP;
-                       image: "00_volume_icon_settings_presed.png" COMP;
+                       image: "sound_volume_popup_bg.#.png" COMP;
+                       image: "00_volume_icon_settings_pressed.png" COMP;
                }
                styles {
                        style {
@@ -294,20 +295,20 @@ RESOURCE_IMAGE_PRESS("00_volume_icon_settings_pressed.png");
                                scale : 1;
                                description {
                                        state : "default" 0.0;
-                                       image.normal: "00_popup_bubble_bg.#.png";
+                                       image.normal: "sound_volume_popup_bg.#.png";
                                        rel1.to : "bg";
                                        rel2.to : "bg";
                                }
                                description {
                                        state : "portrait" 0.0;
-                                       image.normal: "00_popup_bubble_bg.#.png";
+                                       image.normal: "sound_volume_popup_bg.#.png";
                                        rel1.to : "bg";
                                        rel2.to : "bg";
                                }
                                description {
                                        state : "landscape" 0.0;
                                        visible : 1;
-                                       image.normal: "00_popup_bubble_bg.#.png";
+                                       image.normal: "sound_volume_popup_bg.#.png";
                                        rel1.to : "bg";
                                        rel2.to : "bg";
                                }

diff --git a/res/images/private/volume/00_popup_bubble_bg.#.png b/res/images/private/volume/00_popup_bubble_bg.#.png
deleted file mode 100755 (executable)
index 512eafe..0000000
Binary files a/res/images/private/volume/00_popup_bubble_bg.#.png and /dev/null differ

diff --git a/res/images/private/volume/00_volume_icon.png b/res/images/private/volume/00_volume_icon.png
deleted file mode 100755 (executable)
index 4abe0fe..0000000
Binary files a/res/images/private/volume/00_volume_icon.png and /dev/null differ

diff --git a/res/images/private/volume/00_volume_icon_call.png b/res/images/private/volume/00_volume_icon_call.png
deleted file mode 100755 (executable)
index b64770e..0000000
Binary files a/res/images/private/volume/00_volume_icon_call.png and /dev/null differ

diff --git a/res/images/private/volume/00_volume_icon_media.png b/res/images/private/volume/00_volume_icon_media.png
deleted file mode 100755 (executable)
index 2d3dba6..0000000
Binary files a/res/images/private/volume/00_volume_icon_media.png and /dev/null differ

diff --git a/res/images/private/volume/00_volume_icon_mute.png b/res/images/private/volume/00_volume_icon_mute.png
deleted file mode 100755 (executable)
index cc90323..0000000
Binary files a/res/images/private/volume/00_volume_icon_mute.png and /dev/null differ

diff --git a/res/images/private/volume/00_volume_icon_notification.png b/res/images/private/volume/00_volume_icon_notification.png
deleted file mode 100755 (executable)
index 3cf650d..0000000
Binary files a/res/images/private/volume/00_volume_icon_notification.png and /dev/null differ

diff --git a/res/images/private/volume/00_volume_icon_notification_mute.png b/res/images/private/volume/00_volume_icon_notification_mute.png
deleted file mode 100755 (executable)
index 1a3c3a0..0000000
Binary files a/res/images/private/volume/00_volume_icon_notification_mute.png and /dev/null differ

diff --git a/res/images/private/volume/00_volume_icon_notification_vibrate.png b/res/images/private/volume/00_volume_icon_notification_vibrate.png
deleted file mode 100755 (executable)
index 0959277..0000000
Binary files a/res/images/private/volume/00_volume_icon_notification_vibrate.png and /dev/null differ

diff --git a/res/images/private/volume/00_volume_icon_settings.png b/res/images/private/volume/00_volume_icon_settings.png
deleted file mode 100755 (executable)
index 4305660..0000000
Binary files a/res/images/private/volume/00_volume_icon_settings.png and /dev/null differ

diff --git a/res/images/private/volume/00_volume_icon_settings_disabled.png b/res/images/private/volume/00_volume_icon_settings_disabled.png
deleted file mode 100755 (executable)
index 4305660..0000000
Binary files a/res/images/private/volume/00_volume_icon_settings_disabled.png and /dev/null differ

diff --git a/res/images/private/volume/00_volume_icon_vibrat.png b/res/images/private/volume/00_volume_icon_vibrat.png
deleted file mode 100755 (executable)
index 8e7744d..0000000
Binary files a/res/images/private/volume/00_volume_icon_vibrat.png and /dev/null differ

diff --git a/res/images/private/volume/sound_slider_icon_incoming_call.png b/res/images/private/volume/sound_slider_icon_incoming_call.png
new file mode 100755 (executable)
index 0000000..24c01a1
Binary files /dev/null and b/res/images/private/volume/sound_slider_icon_incoming_call.png differ

diff --git a/res/images/private/volume/sound_slider_icon_notification.png b/res/images/private/volume/sound_slider_icon_notification.png
new file mode 100755 (executable)
index 0000000..c255b42
Binary files /dev/null and b/res/images/private/volume/sound_slider_icon_notification.png differ

diff --git a/res/images/private/volume/sound_slider_icon_notification_mute.png b/res/images/private/volume/sound_slider_icon_notification_mute.png
new file mode 100755 (executable)
index 0000000..86197f6
Binary files /dev/null and b/res/images/private/volume/sound_slider_icon_notification_mute.png differ

diff --git a/res/images/private/volume/sound_slider_icon_notification_vibrate.png b/res/images/private/volume/sound_slider_icon_notification_vibrate.png
new file mode 100755 (executable)
index 0000000..008155a
Binary files /dev/null and b/res/images/private/volume/sound_slider_icon_notification_vibrate.png differ

diff --git a/res/images/private/volume/sound_slider_icon_system.png b/res/images/private/volume/sound_slider_icon_system.png
new file mode 100755 (executable)
index 0000000..2629ced
Binary files /dev/null and b/res/images/private/volume/sound_slider_icon_system.png differ

diff --git a/res/images/private/volume/sound_slider_icon_system_mute.png b/res/images/private/volume/sound_slider_icon_system_mute.png
new file mode 100755 (executable)
index 0000000..841c4d3
Binary files /dev/null and b/res/images/private/volume/sound_slider_icon_system_mute.png differ

diff --git a/res/images/private/volume/sound_slider_icon_system_vibrate.png b/res/images/private/volume/sound_slider_icon_system_vibrate.png
new file mode 100755 (executable)
index 0000000..88bbdfc
Binary files /dev/null and b/res/images/private/volume/sound_slider_icon_system_vibrate.png differ

diff --git a/res/images/private/volume/sound_slider_icon_volume.png b/res/images/private/volume/sound_slider_icon_volume.png
new file mode 100755 (executable)
index 0000000..2ed4c99
Binary files /dev/null and b/res/images/private/volume/sound_slider_icon_volume.png differ

diff --git a/res/images/private/volume/sound_slider_icon_volume_mute.png b/res/images/private/volume/sound_slider_icon_volume_mute.png
new file mode 100755 (executable)
index 0000000..c48db73
Binary files /dev/null and b/res/images/private/volume/sound_slider_icon_volume_mute.png differ

diff --git a/res/images/private/volume/sound_slider_icon_volume_vibrate.png b/res/images/private/volume/sound_slider_icon_volume_vibrate.png
new file mode 100755 (executable)
index 0000000..c81ceeb
Binary files /dev/null and b/res/images/private/volume/sound_slider_icon_volume_vibrate.png differ

diff --git a/res/images/private/volume/sound_volume_ic_setting.png b/res/images/private/volume/sound_volume_ic_setting.png
new file mode 100755 (executable)
index 0000000..4a71b76
Binary files /dev/null and b/res/images/private/volume/sound_volume_ic_setting.png differ

diff --git a/res/images/private/volume/sound_volume_popup_bg.#.png b/res/images/private/volume/sound_volume_popup_bg.#.png
new file mode 100755 (executable)
index 0000000..0dcfc27
Binary files /dev/null and b/res/images/private/volume/sound_volume_popup_bg.#.png differ

diff --git a/res/po/ar.po b/res/po/ar.po
index 855a05c..5d6f7d8 100755 (executable)
--- a/res/po/ar.po
+++ b/res/po/ar.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "نغمات الرنين"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "الإشعار"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "مستوى صوت الوسائط"
 

diff --git a/res/po/az.po b/res/po/az.po
index 57f77a8..e806a86 100755 (executable)
--- a/res/po/az.po
+++ b/res/po/az.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Zəng tonu"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Bildiriş"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Media səs"
 

diff --git a/res/po/bg.po b/res/po/bg.po
index 1376c91..3148c7c 100755 (executable)
--- a/res/po/bg.po
+++ b/res/po/bg.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Мелодии"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Уведомяване"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Сила на звука на мултимедия"
 

diff --git a/res/po/ca.po b/res/po/ca.po
index 7265c8c..2bf2ec4 100755 (executable)
--- a/res/po/ca.po
+++ b/res/po/ca.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Melodies"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Notificació"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Volum multimèdia"
 

diff --git a/res/po/cs.po b/res/po/cs.po
index 1203f5a..3aff6f1 100755 (executable)
--- a/res/po/cs.po
+++ b/res/po/cs.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Vyzvánění"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Oznámení"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Hlasitost média"
 

diff --git a/res/po/da.po b/res/po/da.po
index b7406b3..75433ee 100755 (executable)
--- a/res/po/da.po
+++ b/res/po/da.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Ringetoner"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Besked"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Medielydstyrke"
 

diff --git a/res/po/de.po b/res/po/de.po
index 33db3d4..68af952 100755 (executable)
--- a/res/po/de.po
+++ b/res/po/de.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Klingeltöne"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Benachrichtigung"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Medienvolumen"
 

diff --git a/res/po/el_GR.po b/res/po/el_GR.po
index 42dc866..00f26d3 100755 (executable)
--- a/res/po/el_GR.po
+++ b/res/po/el_GR.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Ήχοι κλήσης"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Ειδοποίηση"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Ένταση ήχου μέσων"
 

diff --git a/res/po/en.po b/res/po/en.po
index 4505d1f..5ca44d6 100755 (executable)
--- a/res/po/en.po
+++ b/res/po/en.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Ringtones"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Notification"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Media volume"
 

diff --git a/res/po/en_PH.po b/res/po/en_PH.po
index 4505d1f..5ca44d6 100755 (executable)
--- a/res/po/en_PH.po
+++ b/res/po/en_PH.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Ringtones"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Notification"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Media volume"
 

diff --git a/res/po/en_US.po b/res/po/en_US.po
index 4505d1f..5ca44d6 100755 (executable)
--- a/res/po/en_US.po
+++ b/res/po/en_US.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Ringtones"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Notification"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Media volume"
 

diff --git a/res/po/es_ES.po b/res/po/es_ES.po
index c1b5582..6e5d822 100755 (executable)
--- a/res/po/es_ES.po
+++ b/res/po/es_ES.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Melodías"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Notificaciones"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Volumen multimedia"
 

diff --git a/res/po/es_US.po b/res/po/es_US.po
index 089b9c8..8765f74 100755 (executable)
--- a/res/po/es_US.po
+++ b/res/po/es_US.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Tonos de llamada"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Notificación"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Volumen de archivos multimedia"
 

diff --git a/res/po/et.po b/res/po/et.po
index 9aa3a76..41a5d76 100755 (executable)
--- a/res/po/et.po
+++ b/res/po/et.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Helinad"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Teavitus"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Meediumi helitugevus"
 

diff --git a/res/po/eu.po b/res/po/eu.po
index adb113f..e59961a 100755 (executable)
--- a/res/po/eu.po
+++ b/res/po/eu.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Dei doinuak"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Jakinarazpena"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Multimedia edukiaren bolumena"
 

diff --git a/res/po/fi.po b/res/po/fi.po
index 274abce..4a15132 100755 (executable)
--- a/res/po/fi.po
+++ b/res/po/fi.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Soittoäänet"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Ilmoitus"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Median voimakkuus"
 

diff --git a/res/po/fr.po b/res/po/fr.po
index 1d16b12..ba09e5e 100755 (executable)
--- a/res/po/fr.po
+++ b/res/po/fr.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Sonneries"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Notification"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Volume des médias"
 

diff --git a/res/po/fr_CA.po b/res/po/fr_CA.po
index 1d16b12..ba09e5e 100755 (executable)
--- a/res/po/fr_CA.po
+++ b/res/po/fr_CA.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Sonneries"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Notification"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Volume des médias"
 

diff --git a/res/po/ga.po b/res/po/ga.po
index 90a2c1a..cc0892a 100755 (executable)
--- a/res/po/ga.po
+++ b/res/po/ga.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Clingthoin"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Fógra"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Airde meán"
 

diff --git a/res/po/gl.po b/res/po/gl.po
index f5a64a6..5d125b7 100755 (executable)
--- a/res/po/gl.po
+++ b/res/po/gl.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Melodías"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Notificación"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Volume multimedia"
 

diff --git a/res/po/hr.po b/res/po/hr.po
index 2bee918..f7400a8 100755 (executable)
--- a/res/po/hr.po
+++ b/res/po/hr.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Tonovi zvona"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Obavijest"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Glasnoća multimedija"
 

diff --git a/res/po/hu.po b/res/po/hu.po
index 45c8729..326f2ad 100755 (executable)
--- a/res/po/hu.po
+++ b/res/po/hu.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Csengőhangok"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Értesítés"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Média hangereje"
 

diff --git a/res/po/hy.po b/res/po/hy.po
index 7ca3454..4af062e 100755 (executable)
--- a/res/po/hy.po
+++ b/res/po/hy.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Մեղեդիներ"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Ծանուցում"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Միջոցների ձայնի ուժգնություն"
 

diff --git a/res/po/is.po b/res/po/is.po
index 1c5a619..182c50b 100755 (executable)
--- a/res/po/is.po
+++ b/res/po/is.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Hringitónar"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Tilkynning"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Hljóðstyrkur efnisspilunar"
 

diff --git a/res/po/it_IT.po b/res/po/it_IT.po
index 9e6e5b0..c2637ad 100755 (executable)
--- a/res/po/it_IT.po
+++ b/res/po/it_IT.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Suonerie"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Notifica"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Volume supporti"
 

diff --git a/res/po/ja_JP.po b/res/po/ja_JP.po
index a85adb6..d128709 100755 (executable)
--- a/res/po/ja_JP.po
+++ b/res/po/ja_JP.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "着信音"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "通知"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "メディア音量"
 

diff --git a/res/po/ka.po b/res/po/ka.po
index 7e75b4a..50d8a39 100755 (executable)
--- a/res/po/ka.po
+++ b/res/po/ka.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "ზარის მელოდიები"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "შეტყობინება"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "მედიის ხმის სიმაღლე"
 

diff --git a/res/po/kk.po b/res/po/kk.po
index 8832ebc..cb0cd70 100755 (executable)
--- a/res/po/kk.po
+++ b/res/po/kk.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Әуендер"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Хабарландыру"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Медия дыбысы"
 

diff --git a/res/po/ko_KR.po b/res/po/ko_KR.po
index 9579797..c72fb41 100755 (executable)
--- a/res/po/ko_KR.po
+++ b/res/po/ko_KR.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "벨소리"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "알림"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "미디어 음량"
 

diff --git a/res/po/lt.po b/res/po/lt.po
index 2e19d6d..8c303f1 100755 (executable)
--- a/res/po/lt.po
+++ b/res/po/lt.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Skambėjimo tonai"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Pranešimas"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Medijos garsumas"
 

diff --git a/res/po/lv.po b/res/po/lv.po
index eeadbdd..440e417 100755 (executable)
--- a/res/po/lv.po
+++ b/res/po/lv.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Zvana signāli"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Paziņojums"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Multivides skaļums"
 

diff --git a/res/po/mk.po b/res/po/mk.po
index 30076f6..b4f58a1 100755 (executable)
--- a/res/po/mk.po
+++ b/res/po/mk.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Тонови на ѕвонење"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Известување"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Јачина за медиуми"
 

diff --git a/res/po/nb.po b/res/po/nb.po
index 312e71c..50f0e43 100755 (executable)
--- a/res/po/nb.po
+++ b/res/po/nb.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Ringetoner"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Varsel"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Medievolum"
 

diff --git a/res/po/nl.po b/res/po/nl.po
index 14611a0..4c65b48 100755 (executable)
--- a/res/po/nl.po
+++ b/res/po/nl.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Beltonen"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Melding"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Mediavolume"
 

diff --git a/res/po/pl.po b/res/po/pl.po
index 76b8cee..4e4413d 100755 (executable)
--- a/res/po/pl.po
+++ b/res/po/pl.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Dzwonki"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Powiadomienie"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Głośność multimediów"
 

diff --git a/res/po/pt_BR.po b/res/po/pt_BR.po
index 9542211..da9184f 100755 (executable)
--- a/res/po/pt_BR.po
+++ b/res/po/pt_BR.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Toques"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Notificação"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Volume da mídia"
 

diff --git a/res/po/pt_PT.po b/res/po/pt_PT.po
index 19c5467..47c83d0 100755 (executable)
--- a/res/po/pt_PT.po
+++ b/res/po/pt_PT.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Tons de toque"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Notificação"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Volume de multimédia"
 

diff --git a/res/po/ro.po b/res/po/ro.po
index d372e9c..2484adf 100755 (executable)
--- a/res/po/ro.po
+++ b/res/po/ro.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Tonuri sonerie"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Notificare"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Volum media"
 

diff --git a/res/po/ru_RU.po b/res/po/ru_RU.po
index 821ce6f..469c8cc 100755 (executable)
--- a/res/po/ru_RU.po
+++ b/res/po/ru_RU.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Мелодии звонка"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Уведомление"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Громкость звука"
 

diff --git a/res/po/sk.po b/res/po/sk.po
index b8208f7..511a006 100755 (executable)
--- a/res/po/sk.po
+++ b/res/po/sk.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Zvonenia"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Oznámenie"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Hlasitosť médií"
 

diff --git a/res/po/sl.po b/res/po/sl.po
index ebfb934..10547a9 100755 (executable)
--- a/res/po/sl.po
+++ b/res/po/sl.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Zvonjenja"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Obvestilo"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Glasnost medija"
 

diff --git a/res/po/sr.po b/res/po/sr.po
index efdc260..e1219d6 100755 (executable)
--- a/res/po/sr.po
+++ b/res/po/sr.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Tonovi zvona"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Obaveštenja"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Jačina zvuka medija"
 

diff --git a/res/po/sv.po b/res/po/sv.po
index 268f43c..41f9824 100755 (executable)
--- a/res/po/sv.po
+++ b/res/po/sv.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Ringsignaler"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Avisering"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Medievolym"
 

diff --git a/res/po/tr_TR.po b/res/po/tr_TR.po
index 0baf45a..3d9f77a 100755 (executable)
--- a/res/po/tr_TR.po
+++ b/res/po/tr_TR.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Zil sesleri"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Bildirim"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Medya ses düzeyi"
 

diff --git a/res/po/uk.po b/res/po/uk.po
index 526f871..43db3a7 100755 (executable)
--- a/res/po/uk.po
+++ b/res/po/uk.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Звуки дзвінка"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Сповіщення"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Гучність відтворення медіа"
 

diff --git a/res/po/uz.po b/res/po/uz.po
index e756c17..ce658d7 100755 (executable)
--- a/res/po/uz.po
+++ b/res/po/uz.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "Ringtonlar"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "Xabarnoma"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "Media ovozi balandligi"
 

diff --git a/res/po/volume.pot b/res/po/volume.pot
deleted file mode 100644 (file)
index e4901a6..0000000
--- a/res/po/volume.pot
+++ /dev/null
@@ -1,26 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-21 17:49+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: volume.c:38
-msgid "Application template"
-msgstr ""
-
-#: volume.c:39
-msgid "Click to exit"
-msgstr ""

diff --git a/res/po/zh_CN.po b/res/po/zh_CN.po
index 61c0ee7..8c245d4 100755 (executable)
--- a/res/po/zh_CN.po
+++ b/res/po/zh_CN.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "铃声"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "通知"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "媒体音量"
 

diff --git a/res/po/zh_HK.po b/res/po/zh_HK.po
index a093ff0..ab6ff7c 100755 (executable)
--- a/res/po/zh_HK.po
+++ b/res/po/zh_HK.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "鈴聲"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "通知"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "媒體音量"
 

diff --git a/res/po/zh_TW.po b/res/po/zh_TW.po
index a093ff0..ab6ff7c 100755 (executable)
--- a/res/po/zh_TW.po
+++ b/res/po/zh_TW.po
@@ -1,6 +1,9 @@
 msgid "IDS_ST_HEADER_RINGTONES"
 msgstr "鈴聲"
 
+msgid "IDS_ST_BODY_NOTIFICATION"
+msgstr "通知"
+
 msgid "IDS_ACCS_BODY_MEDIA_VOLUME_TTS"
 msgstr "媒體音量"
 

diff --git a/src/control.c b/src/control.c
index 193b27f..e7bb9c2 100755 (executable)
--- a/src/control.c
+++ b/src/control.c
@@ -38,8 +38,6 @@
 #define VCONF_KEY_FMRADIO_RECORDING "memory/private/Sound/FMRadioRecording"
 
 struct _control_s_info{
-       bundle *volume_bundle;
-
        Eina_Bool is_deleting;
        Eina_Bool is_launching;
        Eina_Bool is_new;
@@ -56,8 +54,6 @@ struct _control_s_info{
        sound_type_e sound_type_at_show;
 };
 static struct _control_s_info control_info = {
-       .volume_bundle = NULL,
-
        .is_deleting = EINA_FALSE,
        .is_launching = EINA_FALSE,
        .is_new = EINA_FALSE,
@@ -81,11 +77,6 @@ static void _control_set_window_rotation(Evas_Object *win);
 static void _rotate_changed_cb(void *data, Evas_Object *obj, void *event_info);
 static void _volume_service_region_set(Evas_Object *win, Evas_Object *warning_popup);
 
-bundle* volume_control_reset_get_bundle(void)
-{
-       return control_info.volume_bundle;
-}
-
 Eina_Bool volume_control_get_is_deleting(void)
 {
        return control_info.is_deleting;

diff --git a/src/sound.c b/src/sound.c
index 652da85..0121e42 100755 (executable)
--- a/src/sound.c
+++ b/src/sound.c
@@ -159,12 +159,9 @@ sound_type_e volume_sound_sound_manager_type_get(void)
        default:
                _E("Failed to get sound type : %d", ret);
                sound_type = SOUND_TYPE_RINGTONE;
-               return sound_type;
+               break;
        }
 
-       if(sound_type == SOUND_TYPE_SYSTEM)
-               sound_type = SOUND_TYPE_RINGTONE;
-
        return sound_type;
 }
 

diff --git a/src/view.c b/src/view.c
index e27f569..594a024 100755 (executable)
--- a/src/view.c
+++ b/src/view.c
@@ -333,6 +333,7 @@ void volume_view_volume_icon_set(sound_type_e sound_type, int sound, int vibrati
 
        switch (sound_type)
        {
+       case SOUND_TYPE_ALARM:
        case SOUND_TYPE_RINGTONE:
                if (sound)
                        img = IMG_VOLUME_ICON;
@@ -342,11 +343,14 @@ void volume_view_volume_icon_set(sound_type_e sound_type, int sound, int vibrati
                        img = IMG_VOLUME_ICON_MUTE;
                break;
        case SOUND_TYPE_MEDIA:
-               img = IMG_VOLUME_ICON_MEDIA;
+               if (volume_sound_sound_manager_volume_get(sound_type) > 0)
+                       img = IMG_VOLUME_ICON;
+               else
+                       img = IMG_VOLUME_ICON_MUTE;
                break;
        case SOUND_TYPE_CALL:
                if (bt_opened)
-                       img = IMG_VOLUME_ICON_CALL;
+                       img = IMG_VOLUME_ICON_HEADPHONE;
                else
                        img = IMG_VOLUME_ICON_CALL;
                break;
@@ -358,9 +362,6 @@ void volume_view_volume_icon_set(sound_type_e sound_type, int sound, int vibrati
                else
                        img = IMG_VOLUME_ICON_NOTI_MUTE;
                break;
-       case SOUND_TYPE_ALARM:
-               img = IMG_VOLUME_ICON_MEDIA;
-               break;
        default:
                img = IMG_VOLUME_ICON;
                break;
@@ -386,6 +387,9 @@ void volume_view_volume_icon_name_set_for_access(sound_type_e sound_type)
        case SOUND_TYPE_CALL:
                snprintf(buf, sizeof(buf), "%s%s", _("IDS_ACCS_SK2_CALL"), "volume");
                break;
+       case SOUND_TYPE_NOTIFICATION:
+               snprintf(buf, sizeof(buf), "%s%s", _("IDS_ST_BODY_NOTIFICATION"), "volume");
+               break;
        default:
                snprintf(buf, sizeof(buf), "%s%s", _("IDS_ST_HEADER_RINGTONES"), "volume");
                break;