Background added to 'connect to car' screen

Change-Id: Ia3874ed3be71093f87801e594a27d01087db25a1
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/edje/images/bg_no_border.png b/edje/images/bg_no_border.png
new file mode 100644 (file)
index 0000000..65a1b79
Binary files /dev/null and b/edje/images/bg_no_border.png differ

diff --git a/edje/images/bg.png b/edje/images/racing_bg.png
similarity index 100%
rename from edje/images/bg.png
rename to edje/images/racing_bg.png

diff --git a/res/edje/button_style.edc b/res/edje/button_style.edc
index 36e5ca1..803d134 100644 (file)
--- a/res/edje/button_style.edc
+++ b/res/edje/button_style.edc
@@ -3,7 +3,7 @@ collections {
    group { "elm/button/base/racing_bottom";
       images {
          image: "button_bottom.png" COMP;
-         image: "bg.png" COMP;
+         image: "button_bottom.png" COMP;
       }
       parts {
          image { "background"
@@ -13,7 +13,7 @@ collections {
                image.normal: "button_bottom.png";
             }
             desc { "pressed";
-               image.normal: "bg.png";
+               image.normal: "button_bottom.png";
             }
          }
          swallow { "elm.swallow.content";

diff --git a/res/edje/emergency_stop.edc b/res/edje/emergency_stop.edc
index 645043a..a9ff7aa 100644 (file)
--- a/res/edje/emergency_stop.edc
+++ b/res/edje/emergency_stop.edc
@@ -2,7 +2,7 @@ collections {
    base_scale: 1.0;
    group { "main";
       images {
-         image: "bg.png" COMP;
+         image: "racing_bg.png" COMP;
          image: "stop.png" COMP;
 
       }
@@ -11,7 +11,7 @@ collections {
             desc { "default";
                rel1.relative: 0.0 0.0;
                rel2.relative: 1.0 1.0;
-               image.normal: "bg.png";
+               image.normal: "racing_bg.png";
                aspect: 1 1;
                aspect_preference: BOTH;
             }

diff --git a/res/edje/gear-racing-controller.edc b/res/edje/gear-racing-controller.edc
index a7c9f79..896e8a0 100644 (file)
--- a/res/edje/gear-racing-controller.edc
+++ b/res/edje/gear-racing-controller.edc
@@ -5,7 +5,17 @@ collections {
       }
    }
    group { name: "main";
+      images {
+         image: "bg_no_border.png" COMP;
+      }
       parts {
+         image { "background"
+            desc { "default";
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+               image.normal: "bg_no_border.png";
+            }
+         }
          text { "txt_title";
             type: TEXTBLOCK;
             mouse_events: 0;

diff --git a/res/edje/racing.edc b/res/edje/racing.edc
index a7a619a..08dd74c 100644 (file)
--- a/res/edje/racing.edc
+++ b/res/edje/racing.edc
@@ -2,14 +2,14 @@ collections {
    base_scale: 1.0;
    group { "main";
       images {
-         image: "bg.png" COMP;
+         image: "racing_bg.png" COMP;
       }
       parts {
          image { "bg";
             desc { "default";
                rel1.relative: 0.0 0.0;
                rel2.relative: 1.0 1.0;
-               image.normal: "bg.png";
+               image.normal: "racing_bg.png";
                aspect: 1 1;
                aspect_preference: BOTH;
             }