wifi_direct: change display logic

Do not display wifi direct icon on activating, activated states.
This path makes wifi direct icon display logic similar to 2.4 product.

Change-Id: I06d59c3584d711b5e5fb85dbe00f9c0e19617531

diff --git a/src/modules/connection/wifi_direct.c b/src/modules/connection/wifi_direct.c
index 0b43035fead338a8c77fd12e1adddf015b8ac98f..e1f54fe5504efe3ad039008a50eb1f56a286fe0f 100644 (file)
--- a/src/modules/connection/wifi_direct.c
+++ b/src/modules/connection/wifi_direct.c
@@ -47,13 +47,13 @@ static const char *_wifi_direct_get_icon_for_state(int vconf_wifi_key_value)
                case VCONFKEY_WIFI_DIRECT_CONNECTED:
                case VCONFKEY_WIFI_DIRECT_GROUP_OWNER:
                        return "Bluetooth, NFC, GPS/b03_wi_fi_direct_on_connected.png";
+               case VCONFKEY_WIFI_DIRECT_CONNECTING:
+               case VCONFKEY_WIFI_DIRECT_DISCONNECTING:
+                       return "Bluetooth, NFC, GPS/b03_wi-fi_direct_on_not_connected.png";
                case VCONFKEY_WIFI_DIRECT_ACTIVATED:
                case VCONFKEY_WIFI_DIRECT_DISCOVERING:
                case VCONFKEY_WIFI_DIRECT_DEACTIVATING:
                case VCONFKEY_WIFI_DIRECT_ACTIVATING:
-               case VCONFKEY_WIFI_DIRECT_CONNECTING:
-               case VCONFKEY_WIFI_DIRECT_DISCONNECTING:
-                       return "Bluetooth, NFC, GPS/b03_wi-fi_direct_on_not_connected.png";
                case VCONFKEY_WIFI_DIRECT_DEACTIVATED:
                        return NULL;
        }
@@ -62,17 +62,16 @@ static const char *_wifi_direct_get_icon_for_state(int vconf_wifi_key_value)
 
 static void _wifi_direct_update_icon(int state)
 {
-       switch (state) {
-               case VCONFKEY_WIFI_DIRECT_DEACTIVATED:
-                       _D("Wifi-Direct off");
-                       icon_hide(&wifi_direct);
-                       util_signal_emit(wifi_direct.ad, "indicator.wifidirect.hide", "indicator.prog");
-                       break;
-               default:
-                       wifi_direct.img_obj.data = _wifi_direct_get_icon_for_state(state);
-                       icon_show(&wifi_direct);
-                       util_signal_emit(wifi_direct.ad, "indicator.wifidirect.show", "indicator.prog");
-                       _D("Wifi-Direct on: %s", wifi_direct.img_obj.data);
+       wifi_direct.img_obj.data = _wifi_direct_get_icon_for_state(state);
+
+       if (wifi_direct.img_obj.data) {
+               _D("Wifi-Direct on: %s", wifi_direct.img_obj.data);
+               icon_show(&wifi_direct);
+               util_signal_emit(wifi_direct.ad, "indicator.wifidirect.show", "indicator.prog");
+       } else {
+               _D("Wifi-Direct off");
+               icon_hide(&wifi_direct);
+               util_signal_emit(wifi_direct.ad, "indicator.wifidirect.hide", "indicator.prog");
        }
 }