Fix N_SE-36848 : block to setting icon.

diff --git a/data/images/private/00_volume_icon.png b/data/images/private/00_volume_icon.png
index ee6b1333785b995a68ccc00c8eb0b150833ff4eb..57a23a035de0bda2d2c32edd6a77ec99e52b0976 100755 (executable)
Binary files a/data/images/private/00_volume_icon.png and b/data/images/private/00_volume_icon.png differ

diff --git a/data/images/private/00_volume_icon_Call.png b/data/images/private/00_volume_icon_Call.png
index 26246b4aa86215e0f843a253685870e16c866664..20631f8413f6a1d6714c3b1cb84871bceb06737a 100755 (executable)
Binary files a/data/images/private/00_volume_icon_Call.png and b/data/images/private/00_volume_icon_Call.png differ

diff --git a/data/images/private/00_volume_icon_Vibrat.png b/data/images/private/00_volume_icon_Vibrat.png
index 4c8fb04158dde45ea3f6278d4b6691e3af7597c0..19e34af03e3f882a9a46b5c965c058858ece5326 100755 (executable)
Binary files a/data/images/private/00_volume_icon_Vibrat.png and b/data/images/private/00_volume_icon_Vibrat.png differ

diff --git a/data/images/private/00_volume_icon_headphone.png b/data/images/private/00_volume_icon_headphone.png
index 76e8098750f954184415fbbd57c2756058e01bbc..6da70b6b0031801667e7565912218964c2b7ae60 100755 (executable)
Binary files a/data/images/private/00_volume_icon_headphone.png and b/data/images/private/00_volume_icon_headphone.png differ

diff --git a/data/images/private/00_volume_icon_media.png b/data/images/private/00_volume_icon_media.png
index 758e3c1d46aecbb1d6fc0f7940ad7776aadd26ee..b6f779558020fd4a0d10cdabfcd94f109d89389d 100755 (executable)
Binary files a/data/images/private/00_volume_icon_media.png and b/data/images/private/00_volume_icon_media.png differ

diff --git a/src/_logic.c b/src/_logic.c
index accf85fde669d7853b2cc6bf5c399ac6830e24f5..b157b94e6e14be63b3d3c3cf46f5be20e4f0e099 100755 (executable)
--- a/src/_logic.c
+++ b/src/_logic.c
@@ -1063,7 +1063,7 @@ int _app_reset(bundle *b, void *data)
        elm_theme_extension_add(th, EDJ_APP);
 
        ad->flag_emul = _check_emul();
-
+#if USE_SETTING_ICON
        if(!ad->flag_emul)
        {
                block = _add_layout(win, EDJ_APP, GRP_VOLUME_BLOCKEVENTS);
@@ -1112,6 +1112,7 @@ int _app_reset(bundle *b, void *data)
        }
        else
        {
+#endif
                block = _add_layout(win, EDJ_APP, GRP_VOLUME_BLOCKEVENTS);
                retvm_if(block == NULL, -1, "Failed to add block layout\n");
 
@@ -1143,7 +1144,9 @@ int _app_reset(bundle *b, void *data)
                elm_object_part_content_set(ad->sl, "icon", ic);
                ad->ic = ic;
                _set_icon(ad, val);
+#if USE_SETTING_ICON
        }
+#endif
 
 
        ret = syspopup_create(b, &handler, ad->win, ad);

diff --git a/src/_sound.c b/src/_sound.c
index ea57587305e744405b340d99e815889e9a5ecf64..a88e308abcc8cbd8d90d177768724869cbc8c18e 100755 (executable)
--- a/src/_sound.c
+++ b/src/_sound.c
@@ -97,7 +97,7 @@ int _set_icon(void *data, int val)
 
        switch(ad->type){
                case VOLUME_TYPE_RINGTONE:
-                       img = IMG_VOLUME_ICON_CALL;
+                       img = IMG_VOLUME_ICON;
                        break;
                case VOLUME_TYPE_MEDIA:
                        if(device == SYSTEM_AUDIO_ROUTE_PLAYBACK_DEVICE_EARPHONE)
@@ -105,6 +105,9 @@ int _set_icon(void *data, int val)
                        else
                                img = IMG_VOLUME_ICON_MEDIA;
                        break;
+               case VOLUME_TYPE_CALL:
+                       img = IMG_VOLUME_ICON_CALL;
+                       break;
                default:
                        img = IMG_VOLUME_ICON;
                        break;

diff --git a/src/volume.h b/src/volume.h
index 38d7a4c284913019cf771737772473b5a914d053..12778e0700f09b1262571ae3f23d997bd2fabadf 100755 (executable)
--- a/src/volume.h
+++ b/src/volume.h
@@ -77,6 +77,8 @@
                x = NULL;\
        }
 
+#define USE_SETTING_ICON 0
+
 struct appdata
 {
        Ecore_X_Window input_win;