projects / platform / core / appfw / data-provider-slave.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5a7c3ef)
Merge Demo branch to devel branch.
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 10 Jun 2013 14:09:05 +0000 (23:09 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 10 Jun 2013 14:10:24 +0000 (23:10 +0900)
[model] Redwood
[binary_type] AP
[customer] Docomo/Orange/Open
[issue#] N/A
[problem] UX is changed.
[cause] N/A
[solution] Update icon.edc
[team] HomeTF
[request]
[horizontal_expansion]

Change-Id: I61db3fcce3fcff3083415378fe4956cb5ac2b7ff

data/icon.edc patch | blob | history
data/icon_shadow.png patch | blob | history

diff --git a/data/icon.edc b/data/icon.edc
index 177a503..01d1e45 100644 (file)
--- a/data/icon.edc
+++ b/data/icon.edc
@@ -27,8 +27,8 @@ collections {
                                type: IMAGE;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 27/175 13/175; }
-                                       rel2 { relative: 148/175 134/175; }
+                                       rel1 { relative: 23/175 11/175; }
+                                       rel2 { relative: 152/175 140/175; }
                                        image { normal: "icon_shadow.png"; }
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
@@ -36,12 +36,29 @@ collections {
                                }
                        }
 
+                        part {
+                                name: "icon";
+                                type: SWALLOW;
+                                description {
+                                        rel1 { relative: 6/129 3/129; to, "bg"; }
+                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                               }
+                        }
+
                        part {
-                               name: "icon";
-                               type: SWALLOW;
+                               name: "name,shadow";
+                               type: TEXT;
+                               // effect: FAR_SHADOW
                                description {
-                                       rel1 { relative: 2/121 2/121; to, "bg"; }
-                                       rel2 { relative: 119/121 119/121; to, "bg"; }
+                                       rel1 { relative: 11/175 135/175; }
+                                       rel2 { relative: 166/175 169/175; }
+                                       color: 0 0 0 102;
+                                       text {
+                                               font: "Tizen:style=Bold";
+                                               text_class: "tizen";
+                                               align: 0.5 0.5;
+                                               size: 26;
+                                       }
                                }
                        }
 
@@ -50,10 +67,10 @@ collections {
                                type: TEXT;
                                // effect: FAR_SHADOW;
                                description {
-                                       rel1 { relative: 8/175 134/175; }
-                                       rel2 { relative: 167/175 162/175; }
-                                       color: 70 70 70 255;
-                                       color3: 255 255 255 153;
+                                       rel1 { relative: 10/175 133/175; }
+                                       rel2 { relative: 165/175 167/175; }
+                                       color: 255 255 255 255;
+                                       //color3: 255 255 255 153;
                                        text {
                                                font: "Tizen:style=Bold";
                                                text_class: "tizen";
@@ -66,15 +83,15 @@ collections {
        }
 
        group {
-               name: "default,2x1";
+               name: "default,2x1"; /* +89.5, 0 */
                parts {
                        part {
                                name: "bg";
                                type: IMAGE;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 116.5/354 13/175; }
-                                       rel2 { relative: 237.5/354 134/175; }
+                                       rel1 { relative: 112.5/354 11/175; }
+                                       rel2 { relative: 241.5/354 140/175; }
                                        image { normal: "icon_shadow.png"; }
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
@@ -82,12 +99,29 @@ collections {
                                }
                        }
 
+                        part {
+                                name: "icon";
+                                type: SWALLOW;
+                                description {
+                                        rel1 { relative: 6/129 3/129; to, "bg"; }
+                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                               }
+                        }
+
                        part {
-                               name: "icon";
-                               type: SWALLOW;
+                               name: "name,shadow";
+                               type: TEXT;
+                               // effect: FAR_SHADOW
                                description {
-                                       rel1 { relative: 2/121 2/121; to, "bg"; }
-                                       rel2 { relative: 119/121 119/121; to, "bg"; }
+                                       rel1 { relative: 100.5/354 135/175; }
+                                       rel2 { relative: 255.5/354 169/175; }
+                                       color: 0 0 0 102;
+                                       text {
+                                               font: "Tizen:style=Bold";
+                                               text_class: "tizen";
+                                               align: 0.5 0.5;
+                                               size: 26;
+                                       }
                                }
                        }
 
@@ -96,10 +130,10 @@ collections {
                                type: TEXT;
                                // effect: FAR_SHADOW;
                                description {
-                                       rel1 { relative: 97.5/354 134/175; }
-                                       rel2 { relative: 256.5/354 162/175; }
-                                       color: 70 70 70 255;
-                                       color3: 255 255 255 153;
+                                       rel1 { relative: 99.5/354 133/175; }
+                                       rel2 { relative: 254.5/354 167/175; }
+                                       color: 255 255 255 255;
+                                       //color3: 255 255 255 153;
                                        text {
                                                font: "Tizen:style=Bold";
                                                text_class: "tizen";
@@ -112,15 +146,15 @@ collections {
        }
 
        group {
-               name: "default,2x2";
+               name: "default,2x2"; /* +89.5, +89.5 */
                parts {
                        part {
                                name: "bg";
                                type: IMAGE;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 116.5/354 102.5/354; }
-                                       rel2 { relative: 237.5/354 223.5/354; }
+                                       rel1 { relative: 112.5/354 100.5/354; }
+                                       rel2 { relative: 241.5/354 229.5/354; }
                                        image { normal: "icon_shadow.png"; }
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
@@ -128,12 +162,29 @@ collections {
                                }
                        }
 
+                        part {
+                                name: "icon";
+                                type: SWALLOW;
+                                description {
+                                        rel1 { relative: 6/129 3/129; to, "bg"; }
+                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                               }
+                        }
+
                        part {
-                               name: "icon";
-                               type: SWALLOW;
+                               name: "name,shadow";
+                               type: TEXT;
+                               // effect: FAR_SHADOW
                                description {
-                                       rel1 { relative: 2/121 2/121; to, "bg"; }
-                                       rel2 { relative: 119/121 119/121; to, "bg"; }
+                                       rel1 { relative: 100.5/354 224.5/354; }
+                                       rel2 { relative: 255.5/354 258.5/354; }
+                                       color: 0 0 0 102;
+                                       text {
+                                               font: "Tizen:style=Bold";
+                                               text_class: "tizen";
+                                               align: 0.5 0.5;
+                                               size: 26;
+                                       }
                                }
                        }
 
@@ -142,10 +193,10 @@ collections {
                                type: TEXT;
                                // effect: FAR_SHADOW;
                                description {
-                                       rel1 { relative: 97.5/354 223.5/354; }
-                                       rel2 { relative: 256.5/354 251.5/354; }
-                                       color: 70 70 70 255;
-                                       color3: 255 255 255 153;
+                                       rel1 { relative: 99.5/354 222.5/354; }
+                                       rel2 { relative: 254.5/354 256.5/354; }
+                                       color: 255 255 255 255;
+                                       //color3: 255 255 255 153;
                                        text {
                                                font: "Tizen:style=Bold";
                                                text_class: "tizen";
@@ -158,15 +209,15 @@ collections {
        }
 
        group {
-               name: "default,4x1";
+               name: "default,4x1"; /* +268.5, 0 */
                parts {
                        part {
                                name: "bg";
                                type: IMAGE;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 295/712 13/175; }
-                                       rel2 { relative: 416/712 134/175; }
+                                       rel1 { relative: 291.5/712 11/175; }
+                                       rel2 { relative: 420.5/712 140/175; }
                                        image { normal: "icon_shadow.png"; }
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
@@ -174,12 +225,29 @@ collections {
                                }
                        }
 
+                        part {
+                                name: "icon";
+                                type: SWALLOW;
+                                description {
+                                        rel1 { relative: 6/129 3/129; to, "bg"; }
+                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                               }
+                        }
+
                        part {
-                               name: "icon";
-                               type: SWALLOW;
+                               name: "name,shadow";
+                               type: TEXT;
+                               // effect: FAR_SHADOW
                                description {
-                                       rel1 { relative: 2/121 2/121; to, "bg"; }
-                                       rel2 { relative: 119/121 119/121; to, "bg"; }
+                                       rel1 { relative: 279.5/712 135/175; }
+                                       rel2 { relative: 434.5/712 169/175; }
+                                       color: 0 0 0 102;
+                                       text {
+                                               font: "Tizen:style=Bold";
+                                               text_class: "tizen";
+                                               align: 0.5 0.5;
+                                               size: 26;
+                                       }
                                }
                        }
 
@@ -188,10 +256,10 @@ collections {
                                type: TEXT;
                                // effect: FAR_SHADOW;
                                description {
-                                       rel1 { relative: 276.5/712 134/175; }
-                                       rel2 { relative: 435.5/712 164/175; }
-                                       color: 70 70 70 255;
-                                       color3: 255 255 255 153;
+                                       rel1 { relative: 278.5/712 133/175; }
+                                       rel2 { relative: 433.5/712 167/175; }
+                                       color: 255 255 255 255;
+                                       //color3: 255 255 255 153;
                                        text {
                                                font: "Tizen:style=Bold";
                                                text_class: "tizen";
@@ -204,15 +272,15 @@ collections {
        }
 
        group {
-               name: "default,4x2";
+               name: "default,4x2"; /* +268.5, +89.5 */
                parts {
                        part {
                                name: "bg";
                                type: IMAGE;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 295/712 102.5/354; }
-                                       rel2 { relative: 416/712 223.5/354; }
+                                       rel1 { relative: 291.5/712 100.5/354; }
+                                       rel2 { relative: 420.5/712 229.5/354; }
                                        image { normal: "icon_shadow.png"; }
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
@@ -220,12 +288,29 @@ collections {
                                }
                        }
 
+                        part {
+                                name: "icon";
+                                type: SWALLOW;
+                                description {
+                                        rel1 { relative: 6/129 3/129; to, "bg"; }
+                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                               }
+                        }
+
                        part {
-                               name: "icon";
-                               type: SWALLOW;
+                               name: "name,shadow";
+                               type: TEXT;
+                               // effect: FAR_SHADOW
                                description {
-                                       rel1 { relative: 2/121 2/121; to, "bg"; }
-                                       rel2 { relative: 119/121 119/121; to, "bg"; }
+                                       rel1 { relative: 279.5/712 224.5/354; }
+                                       rel2 { relative: 434.5/712 258.5/354; }
+                                       color: 0 0 0 102;
+                                       text {
+                                               font: "Tizen:style=Bold";
+                                               text_class: "tizen";
+                                               align: 0.5 0.5;
+                                               size: 26;
+                                       }
                                }
                        }
 
@@ -234,10 +319,10 @@ collections {
                                type: TEXT;
                                // effect: FAR_SHADOW;
                                description {
-                                       rel1 { relative: 276.5/712 223/354; }
-                                       rel2 { relative: 435.5/712 253/354; }
-                                       color: 70 70 70 255;
-                                       color3: 255 255 255 153;
+                                       rel1 { relative: 278.5/712 222.5/354; }
+                                       rel2 { relative: 433.5/712 256.5/354; }
+                                       color: 255 255 255 255;
+                                       //color3: 255 255 255 153;
                                        text {
                                                font: "Tizen:style=Bold";
                                                text_class: "tizen";
@@ -250,15 +335,15 @@ collections {
        }
 
        group {
-               name: "default,4x3";
+               name: "default,4x3"; /* +268.5, +179 */
                parts {
                        part {
                                name: "bg";
                                type: IMAGE;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 295/712 192/533; }
-                                       rel2 { relative: 416/712 313/533; }
+                                       rel1 { relative: 291.5/712 190/533; }
+                                       rel2 { relative: 420.5/712 319/533; }
                                        image { normal: "icon_shadow.png"; }
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
@@ -266,12 +351,29 @@ collections {
                                }
                        }
 
+                        part {
+                                name: "icon";
+                                type: SWALLOW;
+                                description {
+                                        rel1 { relative: 6/129 3/129; to, "bg"; }
+                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                               }
+                        }
+
                        part {
-                               name: "icon";
-                               type: SWALLOW;
+                               name: "name,shadow";
+                               type: TEXT;
+                               // effect: FAR_SHADOW
                                description {
-                                       rel1 { relative: 2/121 2/121; to, "bg"; }
-                                       rel2 { relative: 119/121 119/121; to, "bg"; }
+                                       rel1 { relative: 279.5/712 314/533; }
+                                       rel2 { relative: 434.5/712 348/533; }
+                                       color: 0 0 0 102;
+                                       text {
+                                               font: "Tizen:style=Bold";
+                                               text_class: "tizen";
+                                               align: 0.5 0.5;
+                                               size: 26;
+                                       }
                                }
                        }
 
@@ -280,10 +382,10 @@ collections {
                                type: TEXT;
                                // effect: FAR_SHADOW;
                                description {
-                                       rel1 { relative: 276.5/712 313/533; }
-                                       rel2 { relative: 435.5/712 341/533; }
-                                       color: 70 70 70 255;
-                                       color3: 255 255 255 153;
+                                       rel1 { relative: 278.5/712 312/533; }
+                                       rel2 { relative: 433.5/712 346/533; }
+                                       color: 255 255 255 255;
+                                       //color3: 255 255 255 153;
                                        text {
                                                font: "Tizen:style=Bold";
                                                text_class: "tizen";
@@ -296,15 +398,15 @@ collections {
        }
 
        group {
-               name: "default,4x4";
+               name: "default,4x4"; /* +268.5, +268.5 */
                parts {
                        part {
                                name: "bg";
                                type: IMAGE;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 295/712 281.5/712; }
-                                       rel2 { relative: 416/712 402.5/712; }
+                                       rel1 { relative: 291.5/712 279.5/712; }
+                                       rel2 { relative: 420.5/712 408.5/712; }
                                        image { normal: "icon_shadow.png"; }
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
@@ -312,12 +414,29 @@ collections {
                                }
                        }
 
+                        part {
+                                name: "icon";
+                                type: SWALLOW;
+                                description {
+                                        rel1 { relative: 6/129 3/129; to, "bg"; }
+                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                               }
+                        }
+
                        part {
-                               name: "icon";
-                               type: SWALLOW;
+                               name: "name,shadow";
+                               type: TEXT;
+                               // effect: FAR_SHADOW
                                description {
-                                       rel1 { relative: 2/121 2/121; to, "bg"; }
-                                       rel2 { relative: 119/121 119/121; to, "bg"; }
+                                       rel1 { relative: 279.5/712 403.5/712; }
+                                       rel2 { relative: 434.5/712 437.5/712; }
+                                       color: 0 0 0 102;
+                                       text {
+                                               font: "Tizen:style=Bold";
+                                               text_class: "tizen";
+                                               align: 0.5 0.5;
+                                               size: 26;
+                                       }
                                }
                        }
 
@@ -326,10 +445,10 @@ collections {
                                type: TEXT;
                                // effect: FAR_SHADOW;
                                description {
-                                       rel1 { relative: 276.5/712 402.5/712; }
-                                       rel2 { relative: 435.5/712 430.5/712; }
-                                       color: 70 70 70 255;
-                                       color3: 255 255 255 153;
+                                       rel1 { relative: 278.5/712 401.5/712; }
+                                       rel2 { relative: 433.5/712 435.5/712; }
+                                       color: 255 255 255 255;
+                                       //color3: 255 255 255 153;
                                        text {
                                                font: "Tizen:style=Bold";
                                                text_class: "tizen";
@@ -342,15 +461,15 @@ collections {
        }
 
        group {
-               name: "default,4x5";
+               name: "default,4x5"; /* +268.5, +358 , 891 */
                parts {
                        part {
                                name: "bg";
                                type: IMAGE;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 295/712 371/891; }
-                                       rel2 { relative: 416/712 492/891; }
+                                       rel1 { relative: 291.5/712 369/891; }
+                                       rel2 { relative: 420.5/712 498/891; }
                                        image { normal: "icon_shadow.png"; }
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
@@ -358,12 +477,29 @@ collections {
                                }
                        }
 
+                        part {
+                                name: "icon";
+                                type: SWALLOW;
+                                description {
+                                        rel1 { relative: 6/129 3/129; to, "bg"; }
+                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                               }
+                        }
+
                        part {
-                               name: "icon";
-                               type: SWALLOW;
+                               name: "name,shadow";
+                               type: TEXT;
+                               // effect: FAR_SHADOW
                                description {
-                                       rel1 { relative: 2/121 2/121; to, "bg"; }
-                                       rel2 { relative: 119/121 119/121; to, "bg"; }
+                                       rel1 { relative: 279.5/712 493/891; }
+                                       rel2 { relative: 434.5/712 527/891; }
+                                       color: 0 0 0 102;
+                                       text {
+                                               font: "Tizen:style=Bold";
+                                               text_class: "tizen";
+                                               align: 0.5 0.5;
+                                               size: 26;
+                                       }
                                }
                        }
 
@@ -372,10 +508,10 @@ collections {
                                type: TEXT;
                                // effect: FAR_SHADOW;
                                description {
-                                       rel1 { relative: 276.5/712 492/891; }
-                                       rel2 { relative: 435.5/712 520/891; }
-                                       color: 70 70 70 255;
-                                       color3: 255 255 255 153;
+                                       rel1 { relative: 278.5/712 491/891; }
+                                       rel2 { relative: 433.5/712 525/891; }
+                                       color: 255 255 255 255;
+                                       //color3: 255 255 255 153;
                                        text {
                                                font: "Tizen:style=Bold";
                                                text_class: "tizen";
@@ -388,15 +524,15 @@ collections {
        }
 
        group {
-               name: "default,4x6";
+               name: "default,4x6"; /* +268.5, +447.5, 1070 */
                parts {
                        part {
                                name: "bg";
                                type: IMAGE;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 295/712 460.5/1070; }
-                                       rel2 { relative: 416/712 581.5/1070; }
+                                       rel1 { relative: 291.5/712 458.5/1070; }
+                                       rel2 { relative: 420.5/712 587.5/1070; }
                                        image { normal: "icon_shadow.png"; }
                                        align: 0.5 0.5;
                                        aspect: 1.0 1.0;
@@ -404,12 +540,29 @@ collections {
                                }
                        }
 
+                        part {
+                                name: "icon";
+                                type: SWALLOW;
+                                description {
+                                        rel1 { relative: 6/129 3/129; to, "bg"; }
+                                        rel2 { relative: 123/129 120/129; to, "bg"; }
+                               }
+                        }
+
                        part {
-                               name: "icon";
-                               type: SWALLOW;
+                               name: "name,shadow";
+                               type: TEXT;
+                               // effect: FAR_SHADOW
                                description {
-                                       rel1 { relative: 2/121 2/121; to, "bg"; }
-                                       rel2 { relative: 119/121 119/121; to, "bg"; }
+                                       rel1 { relative: 279.5/712 582.5/1070; }
+                                       rel2 { relative: 434.5/712 616.5/1070; }
+                                       color: 0 0 0 102;
+                                       text {
+                                               font: "Tizen:style=Bold";
+                                               text_class: "tizen";
+                                               align: 0.5 0.5;
+                                               size: 26;
+                                       }
                                }
                        }
 
@@ -418,10 +571,10 @@ collections {
                                type: TEXT;
                                // effect: FAR_SHADOW;
                                description {
-                                       rel1 { relative: 276.5/712 581.5/1070; }
-                                       rel2 { relative: 435.5/712 609.5/1070; }
-                                       color: 70 70 70 255;
-                                       color3: 255 255 255 153;
+                                       rel1 { relative: 278.5/712 580.5/1070; }
+                                       rel2 { relative: 433.5/712 614.5/1070; }
+                                       color: 255 255 255 255;
+                                       //color3: 255 255 255 153;
                                        text {
                                                font: "Tizen:style=Bold";
                                                text_class: "tizen";
diff --git a/data/icon_shadow.png b/data/icon_shadow.png
index 7e40ac4..65e836b 100644 (file)
Binary files a/data/icon_shadow.png and b/data/icon_shadow.png differ
Domain: App Framework / Application Utility;