Fix N_SE-36848 : block to setting icon.
authorhhh.kwon <hhh.kwon@samsung.com>
Mon, 29 Apr 2013 13:23:48 +0000 (22:23 +0900)
committerhhh.kwon <hhh.kwon@samsung.com>
Mon, 29 Apr 2013 13:23:48 +0000 (22:23 +0900)
data/images/private/00_volume_icon.png
data/images/private/00_volume_icon_Call.png
data/images/private/00_volume_icon_Vibrat.png
data/images/private/00_volume_icon_headphone.png
data/images/private/00_volume_icon_media.png
src/_logic.c
src/_sound.c
src/volume.h

index ee6b133..57a23a0 100755 (executable)
Binary files a/data/images/private/00_volume_icon.png and b/data/images/private/00_volume_icon.png differ
index 26246b4..20631f8 100755 (executable)
Binary files a/data/images/private/00_volume_icon_Call.png and b/data/images/private/00_volume_icon_Call.png differ
index 4c8fb04..19e34af 100755 (executable)
Binary files a/data/images/private/00_volume_icon_Vibrat.png and b/data/images/private/00_volume_icon_Vibrat.png differ
index 76e8098..6da70b6 100755 (executable)
Binary files a/data/images/private/00_volume_icon_headphone.png and b/data/images/private/00_volume_icon_headphone.png differ
index 758e3c1..b6f7795 100755 (executable)
Binary files a/data/images/private/00_volume_icon_media.png and b/data/images/private/00_volume_icon_media.png differ
index accf85f..b157b94 100755 (executable)
@@ -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);
index ea57587..a88e308 100755 (executable)
@@ -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;
index 38d7a4c..12778e0 100755 (executable)
@@ -77,6 +77,8 @@
                x = NULL;\
        }
 
+#define USE_SETTING_ICON 0
+
 struct appdata
 {
        Ecore_X_Window input_win;