[TBT][tizen_3.0_wearable][Fixed crash issue for tw1 device, the object size of swallo...

Change-Id: I7a4d43d3f943e13f3e99b0d49e1a7be19565a859

diff --git a/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk
index b1d99bf70453601521c2243ce6d4ba1be3080518..8b5da704cc7409a09cec25c6adf8cc19ec43843c 100644 (file)
Binary files a/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk
index eb5d3c45c89901195f5b8f9fbb5f7a95b419efad..fc9b2b1cc46d99642ea89ffb2cd6ee4146bfcb0a 100644 (file)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk differ

diff --git a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/3_part_cnt2.75_cnt_btn.edc b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/3_part_cnt2.75_cnt_btn.edc
index b1bc941a9ecaf52b2e67079878b9cf65edbab032..74909f084312a1ecc542610d0a07caa45d9cab20 100644 (file)
--- a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/3_part_cnt2.75_cnt_btn.edc
+++ b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/3_part_cnt2.75_cnt_btn.edc
@@ -21,6 +21,15 @@ collections
     {
         name: "3_part_cnt_cnt_btn";
         parts{
+               part{
+                name: "base";
+                type: RECT;
+                description{
+                    state: "default" 0.0;
+                    visible: 1;
+                    color: 255 0 0 255;
+                }
+            }
             part{
                 name: "1cnt";
                 type: SWALLOW;
@@ -34,6 +43,7 @@ collections
                     rel2{
                         relative:1.0 0.35;
                     }
+                    fixed: 1 1;
                 }
             }   
             
@@ -50,6 +60,7 @@ collections
                     rel2{
                         relative:1.0 0.70;
                     }
+                    fixed: 1 1;
                 }
             }  
             
@@ -74,6 +85,7 @@ collections
                                                relative: 1.0 1.0;
                                        }
                                        visible: 1;
+                                       fixed: 1 1;
                                }
                        }  
         }

diff --git a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/3_part_cnt2.75_txt_btn.edc b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/3_part_cnt2.75_txt_btn.edc
index ab47c418b31579b6f83d0c07f6a2ecd7cd4f666b..5b6dc04d89ecde8a736d23a7162792541d481cbb 100644 (file)
--- a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/3_part_cnt2.75_txt_btn.edc
+++ b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/3_part_cnt2.75_txt_btn.edc
@@ -21,6 +21,16 @@ collections
     {
         name: "3_part_cnt_txt_btn";
         parts{
+               part{
+                name: "base";
+                type: RECT;
+                description{
+                    state: "default" 0.0;
+                    visible: 1;
+                    color: 255 0 0 255;
+                }
+            }
+
             part{
                 name: "1cnt";
                 type: SWALLOW;
@@ -34,6 +44,7 @@ collections
                     rel2{
                         relative:1.0 0.60;
                     }
+                    fixed: 1 1;
                 }
             }
             
@@ -50,6 +61,7 @@ collections
                     rel2{
                         relative:1.0 0.70;
                     }
+                    fixed: 1 1;
                 }
             }
             
@@ -75,6 +87,7 @@ collections
                                                relative: 1.0 1.0;
                                        }
                                        visible: 1;
+                                       fixed: 1 1;
                                }
                        }  
         }

diff --git a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/4_part_cnt1.25_cnt1.5_btn_btn.edc b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/4_part_cnt1.25_cnt1.5_btn_btn.edc
index 68355a68b3617b896cadf83bd3c1826111337da4..9d1cd3530f51d2415fd620a9f8f78cc58b1817d2 100644 (file)
--- a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/4_part_cnt1.25_cnt1.5_btn_btn.edc
+++ b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/4_part_cnt1.25_cnt1.5_btn_btn.edc
@@ -20,7 +20,16 @@ collections
     group
     {
         name: "4_part_cnt_cnt_btn_btn";
-        parts{                 
+        parts{ 
+               part{
+                name: "base";
+                type: RECT;
+                description{
+                    state: "default" 0.0;
+                    visible: 1;
+                    color: 255 0 0 255;
+                }
+            }          
             part{
                 name: "1cnt";
                 type: SWALLOW;
@@ -30,6 +39,7 @@ collections
                     visible: 1;
                     rel1 {relative: 0.0 0.0; }
                     rel2 {relative: 1.0 0.25; }
+                    fixed: 1 1;
                 }
             }
             
@@ -45,6 +55,7 @@ collections
                                                   relative: 1.0 0.60; 
                     }
                     visible: 1;
+                    fixed: 1 1;
                 }
             }
             
@@ -70,6 +81,7 @@ collections
                                                   relative: 1.0 0.70; 
                     }
                     visible: 1;
+                    fixed: 1 1;
                 }
                        }
                        
@@ -94,6 +106,7 @@ collections
                                                relative: 1.0 1.0;
                                        }
                                        visible: 1;
+                                       fixed: 1 1;
                                }
                        }
                }

diff --git a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/4_part_txt_cnt2_btn_btn.edc b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/4_part_txt_cnt2_btn_btn.edc
index 1d2eac707945de200badd2f305b918443bb6599a..dd1cfc20eaae8d12f2e5b32dc144f31f3ddbd1e2 100644 (file)
--- a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/4_part_txt_cnt2_btn_btn.edc
+++ b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/4_part_txt_cnt2_btn_btn.edc
@@ -20,6 +20,17 @@ collections
    {
       name: "4_part_txt_cnt_btn_btn";
       parts{
+      
+       part{
+            name: "base";
+            type: RECT;
+            description{
+                state: "default" 0.0;
+                visible: 1;
+                color: 255 0 0 255;
+            }
+           }
+            
          part{
             name: "1txt";
             type: SWALLOW;
@@ -33,6 +44,7 @@ collections
                rel2 {
                   relative: 1.0 0.10;
                }
+               fixed: 1 1;
             }
          }
          part{
@@ -47,6 +59,7 @@ collections
                   relative: 1.0 0.60;
                }
                visible: 1;
+               fixed: 1 1;
             }
          }
          part { name: "padding";
@@ -74,6 +87,7 @@ collections
                   relative: 1.0 0.70;
                }
                visible: 1;
+               fixed: 1 1;
             }
          }
          part { name: "padding2";
@@ -100,6 +114,7 @@ collections
                   relative: 1.0 1.0;
                }
                visible: 1;
+               fixed: 1 1;
             }
          }
       }
@@ -122,6 +137,7 @@ collections
                rel2 {
                   relative: 1.0 0.08;
                }
+               fixed: 1 1;
             }
          }
          
@@ -139,6 +155,7 @@ collections
                rel2 {
                   relative: 1.0 0.25;
                }
+               fixed: 1 1;
             }
          }
          
@@ -155,6 +172,7 @@ collections
                   relative: 1.0 0.60;
                }
                visible: 1;
+               fixed: 1 1;
             }
          }
          part { name: "padding";
@@ -182,6 +200,7 @@ collections
                   relative: 1.0 0.70;
                }
                visible: 1;
+               fixed: 1 1;
             }
          }
          part { name: "padding2";
@@ -208,9 +227,10 @@ collections
                   relative: 1.0 1.0;
                }
                visible: 1;
+               fixed: 1 1;
             }
          }
       }
    }
    
-}
\ No newline at end of file
+}

diff --git a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/4_part_txt_txt_btn_btn.edc b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/4_part_txt_txt_btn_btn.edc
index 72012f6cc6b07981cc538c36eec39d31896dc0b6..4409b0bfb577c31a2e8ef50a5cc264b05b3701d0 100644 (file)
--- a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/4_part_txt_txt_btn_btn.edc
+++ b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/4_part_txt_txt_btn_btn.edc
@@ -21,6 +21,16 @@ collections
     {
         name: "4_part_txt_txt_btn_btn";
         parts{
+                                part{
+                name: "base";
+                type: RECT;
+                description{
+                    state: "default" 0.0;
+                    visible: 1;
+                    color: 255 0 0 255;
+                }
+            }
+
             part{
                 name: "1txt";
                 type: SWALLOW;
@@ -30,6 +40,7 @@ collections
                     visible: 1;
                     rel1 {relative: 0.0 0.0; }
                     rel2 {relative: 1.0 0.10; }
+                    fixed: 1 1;
                 }
             }
             
@@ -52,6 +63,7 @@ collections
                     visible: 1;
                     rel1 {relative: 0.0 0.15; }
                     rel2 {relative: 1.0 0.25; }
+                    fixed: 1 1;
                 }
             }
             
@@ -77,6 +89,7 @@ collections
                                                   relative: 1.0 0.70; 
                     }
                     visible: 1;
+                    fixed: 1 1;
                 }
                        }
                        
@@ -101,6 +114,7 @@ collections
                                                relative: 1.0 1.0;
                                        }
                                        visible: 1;
+                    fixed: 1 1;
                                }
                        }
         }

diff --git a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/5_part_cnt__cnt__cnt__cnt_btn.edc b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/5_part_cnt__cnt__cnt__cnt_btn.edc
index e992b46f4bf69625d050aa847498a40bda8ba5dd..6f887ad26c9f7f9580d3373e1c58148a7df151ef 100644 (file)
--- a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/5_part_cnt__cnt__cnt__cnt_btn.edc
+++ b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/5_part_cnt__cnt__cnt__cnt_btn.edc
@@ -20,7 +20,17 @@ collections
     group
     {
         name: "5_part_cnt_cnt_cnt_cnt_btn";
-        parts{                 
+        parts{ 
+               part{
+                name: "base";
+                type: RECT;
+                description{
+                    state: "default" 0.0;
+                    visible: 1;
+                    color: 255 0 0 255;
+                }
+            }
+               
             part{
                 name: "1cnt";
                 type: SWALLOW;
@@ -30,6 +40,7 @@ collections
                     visible: 1;
                     rel1 {relative: 0.0 0.25; }
                     rel2 {relative: 0.33 0.35; }
+                    fixed: 1 1;
                 }
             }
 
@@ -42,6 +53,7 @@ collections
                     visible: 1;
                     rel1 {relative: 0.33 0.25; }
                     rel2 {relative: 0.67 0.35; }
+                    fixed: 1 1;
                 }
             }
             
@@ -54,6 +66,7 @@ collections
                     visible: 1;
                     rel1 {relative: 0.67 0.25; }
                     rel2 {relative: 1.0 0.35; }
+                    fixed: 1 1;
                 }
             }
 
@@ -70,6 +83,7 @@ collections
                                                   relative: 1.0 0.70; 
                     }
                     visible: 1;
+                    fixed: 1 1;
                 }
                        }
                        
@@ -94,6 +108,7 @@ collections
                                                relative: 1.0 1.0;
                                        }
                                        visible: 1;
+                                       fixed: 1 1;
                                }
                        }
                }

diff --git a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/6_part_cnt0.75_cnt0.75_cnt0.75_cnt0.75_cnt0.75_btn.edc b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/6_part_cnt0.75_cnt0.75_cnt0.75_cnt0.75_cnt0.75_btn.edc
index b4ef230e4d937c77d2fc634df7f39ec17e08c3d4..ff8bf9a80b567adecc20f484fe469efe870042a7 100644 (file)
--- a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/6_part_cnt0.75_cnt0.75_cnt0.75_cnt0.75_cnt0.75_btn.edc
+++ b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/6_part_cnt0.75_cnt0.75_cnt0.75_cnt0.75_cnt0.75_btn.edc
@@ -21,6 +21,16 @@ collections
     {
         name: "6_part_cnt_cnt_cnt_cnt_txt_btn";
         parts{
+               part{
+                name: "base";
+                type: RECT;
+                description{
+                    state: "default" 0.0;
+                    visible: 1;
+                    color: 255 0 0 255;
+                }
+            }
+
             part{
                 name: "1cnt";
                 type: SWALLOW;
@@ -30,6 +40,7 @@ collections
                     visible: 1;
                     rel1 {relative: 0.0 0.0; }
                     rel2 {relative: 1.0 0.15; }
+                    fixed: 1 1;
                 }
             }
 
@@ -45,6 +56,7 @@ collections
                     rel2{
                         relative: 1.0 0.30;
                     }
+                    fixed: 1 1;
                 }
             }
 
@@ -57,6 +69,7 @@ collections
                     visible: 1;
                     rel1 {relative: 0.0 0.30;}
                     rel2 {relative: 1.0 0.45; }
+                    fixed: 1 1;
                 }
             }
 
@@ -73,6 +86,7 @@ collections
                     rel2{
                         relative: 1.0 0.60;
                     }
+                    fixed: 1 1;
                 }
             }
                    
@@ -88,6 +102,7 @@ collections
                                                 relative: 1.0 0.70; 
                     }
                     visible: 1;
+                    fixed: 1 1;
                 }
             }
             
@@ -112,6 +127,7 @@ collections
                                                relative: 1.0 1.0;
                                        }
                                        visible: 1;
+                                       fixed: 1 1;
                                }
                        }
         }