modules/network/rssi: Empty space removed.

If second sim is not available do not leave empty space.

Change-Id: Ia258cd54854e241668755305578a5211b00cfeef
Signed-off-by: Radoslaw Czerski <r.czerski@samsung.com>

diff --git a/res/resource/indicator_common.edc b/res/resource/indicator_common.edc
index 80e4ea00e8722ffe2fda9499993437d3d2f59732..be42f5acd26fa46740a1f8e12c3074c48f13eda0 100644 (file)
--- a/res/resource/indicator_common.edc
+++ b/res/resource/indicator_common.edc
@@ -89,6 +89,42 @@
                                } \
                        } \
 
+#define SWALLOW_PART_FROM_LEFT_WITH_SPACE_AND_CONSTRICTION( partName, rel_x, rel_y, MinWidth, MinHeight, MaxHeight) \
+                       part {\
+                         name : "rect."partName; \
+                         type : RECT;\
+                         scale : 1;\
+                         description {\
+                            state : "default" 0.0;\
+                            rel1.to : partName;\
+                            rel2.to : partName;\
+                            color : 0 0 0 0;\
+                         }\
+                       }\
+                       part { \
+                               name: partName; \
+                               type: SWALLOW; \
+                               scale: 1; \
+                               description { \
+                                       state: "default" 0.0; \
+                                       min: MinWidth MinHeight; \
+                                       fixed: 1 0; \
+                                       rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
+                                       rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
+                                       align: 0.0 0.5; \
+                                       visible: 1; \
+                               } \
+                               description { \
+                                       state: "hide" 0.0; \
+                                       max: 0 MaxHeight; \
+                                       fixed: 1 0; \
+                                       rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
+                                       rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
+                                       align: 0.0 0.5; \
+                                       visible: 0; \
+                               } \
+                       } \
+
 #define SWALLOW_PART_FROM_LEFT_WITH_EFFECT( partName, rel_x, rel_y, MinWidth, MinHeight) \
                        part { \
                                name: partName; \
@@ -274,6 +310,30 @@
                                } \
                        } \
 
+#define FIXED_RSSI_RECT_FROM_LEFT_WITH_CONSTRICTION( rectName, rel_x, rel_y, MinWidth, MaxHeight, colorValue, visibleValue) \
+                       part { \
+                               name: rectName; \
+                               type: RECT; \
+                               mouse_events: 0; \
+                               scale: 1; \
+                               description { \
+                                       state: "default" 0.0; \
+                                       min: MinWidth 0; \
+                                       fixed: 1 1; \
+                                       rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
+                                       rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
+                                       align: 0.0 0.5; \
+                                       color : colorValue; \
+                                       visible: visibleValue; \
+                               } \
+                               description { \
+                                       state: "hide" 0.0; \
+                                       inherit: "default" 0.0; \
+                                       max: 0 MaxHeight; \
+                                       visible: 0; \
+                               } \
+                       } \
+
 #define FIXED_RECT_FROM_RIGHT( rectName, rel_x, rel_y, MinWidth, colorValue, visibleValue) \
                        part { \
                                name: rectName; \

diff --git a/res/resource/indicator_port.edc b/res/resource/indicator_port.edc
index c5f6b2a6987d2b0565f68d335d9aba1a35c89d51..055f14a224c6cae70897c0f9e9caa18474c4b2d7 100644 (file)
--- a/res/resource/indicator_port.edc
+++ b/res/resource/indicator_port.edc
@@ -704,15 +704,11 @@ collections {
                        SWALLOW_PART_FROM_LEFT_WITH_SPACE( "elm.swallow.fixed1", "elm.rect.rssi1", "elm.rect.bg", DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT )
 
                        /* ICON_FIXED4 (RSSI 2) + PADDING_FIXED5(RIGHT, FIXED PADDING) */
-                       FIXED_RECT_FROM_LEFT( "elm.rect.rssi2", "elm.swallow.fixed1", "elm.rect.bg", DEFAULT_ICON_PADDING, INDI_DEFAULT_BG_TEST, 0)
-                       SWALLOW_PART_FROM_LEFT_WITH_SPACE( "elm.swallow.fixed2", "elm.rect.rssi2", "elm.rect.bg", DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT )
-
-                       /* ICON_FIXED2 (Sim Icon) + PADDING_FIXED3(RIGHT, FIXED PADDING) */
-                       FIXED_RECT_FROM_LEFT( "elm.rect.simicon", "elm.swallow.fixed2", "elm.rect.bg", DEFAULT_ICON_PADDING, INDI_DEFAULT_BG_TEST, 0)
-                       SWALLOW_PART_FROM_LEFT_WITH_SPACE( "elm.swallow.fixed3", "elm.rect.simicon", "elm.rect.bg", DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT )
+                       FIXED_RSSI_RECT_FROM_LEFT_WITH_CONSTRICTION( "elm.rect.rssi2", "elm.swallow.fixed1", "elm.rect.bg", DEFAULT_ICON_PADDING, DEFAULT_ICON_WIDTH, INDI_DEFAULT_BG_TEST, 0)
+                       SWALLOW_PART_FROM_LEFT_WITH_SPACE_AND_CONSTRICTION( "elm.swallow.fixed2", "elm.rect.rssi2", "elm.rect.bg", DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT, DEFAULT_ICON_WIDTH)
 
                        /* ICON_FIXED1 (Connection-3G) + PADDING_NONFIXED1(RIGHT,DYNAMIC PADDING) */
-                       FIXED_RECT_FROM_LEFT( "elm.rect.connection", "elm.swallow.fixed3", "elm.rect.bg", DEFAULT_ICON_PADDING, INDI_DEFAULT_BG_TEST, 0)
+                       FIXED_RECT_FROM_LEFT( "elm.rect.connection", "elm.swallow.fixed2", "elm.rect.bg", DEFAULT_ICON_PADDING, INDI_DEFAULT_BG_TEST, 0)
                        SWALLOW_PART_FROM_LEFT_WITH_SPACE( "elm.swallow.fixed4", "elm.rect.connection", "elm.rect.bg", DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT )
                        /* Connection-3G UpDown arrow icon */
                        part {
@@ -1550,6 +1546,7 @@ collections {
                                source: "indicator.prog";
                                target: "elm.swallow.fixed2";
                                target: "elm.rect.rssi2";
+                               target: "rect.elm.swallow.fixed2";
                        }
 
                        program {
@@ -1559,24 +1556,7 @@ collections {
                                source: "indicator.prog";
                                target: "elm.swallow.fixed2";
                                target: "elm.rect.rssi2";
-                       }
-                       // Sim Icon
-                       program {
-                               name: "indicator.simicon.show";
-                               action: STATE_SET "default" 0.0;
-                               signal: "indicator.simicon.show";
-                               source: "indicator.prog";
-                               target: "elm.swallow.fixed3";
-                               target: "elm.rect.simicon";
-                       }
-
-                       program {
-                               name: "indicator.simicon.hide";
-                               action: STATE_SET "hide" 0.0;
-                               signal: "indicator.simicon.hide";
-                               source: "indicator.prog";
-                               target: "elm.swallow.fixed3";
-                               target: "elm.rect.simicon";
+                               target: "rect.elm.swallow.fixed2";
                        }
 
                        /* Connection - 3G */