[TBT][camera][Non-ACR][TFDF-10672, Fixed UI issue realted to camera]

Change-Id: Iabff30e4d4d255d9f5a34e720d2e2990ed8a5c22
Signed-off-by: Nibha Sharma <nibha.sharma@samsung.com>

diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk
old mode 100644 (file)
new mode 100755 (executable)
index 8c14a60..32cb2dc
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk
old mode 100644 (file)
new mode 100755 (executable)
index dd2c614..863309a
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ

diff --git a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/6_part_txt_cnt_txt_cnt_btn_btn.edc b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/6_part_txt_cnt_txt_cnt_btn_btn.edc
old mode 100644 (file)
new mode 100755 (executable)
index 91e13d3..7b34126
--- a/tbtcoreapp/res/edje/2.3.1/wearable_360_360/6_part_txt_cnt_txt_cnt_btn_btn.edc
+++ b/tbtcoreapp/res/edje/2.3.1/wearable_360_360/6_part_txt_cnt_txt_cnt_btn_btn.edc
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#define TEXT_HEIGHT 0.08
+#define HEADER_HIGHT 0.2
 collections
 {
     base_scale: 1.40;
@@ -28,8 +30,8 @@ collections
                     state: "default" 0.0;
                     align: 0.0 0.0;
                     visible: 1;
-                    rel1 {relative: 0.0 0.2; }
-                    rel2 {relative: 0.80 0.10; }
+                    rel1 {relative: 0.0 HEADER_HIGHT+0.0; }
+                    rel2 {relative: 1.0 HEADER_HIGHT+TEXT_HEIGHT; }
                 }
             }
 
@@ -38,12 +40,13 @@ collections
                 type: SWALLOW;
                 description{
                     state: "default" 0.0;
+                    align: 0.0 0.0;
                     visible: 1;
                     rel1{
-                        relative: 0.0 0.10;
+                        relative: 0.0 HEADER_HIGHT+TEXT_HEIGHT;
                     }
                     rel2{
-                        relative: 0.80 0.60;
+                        relative: 1.0 0.38;
                     }
                 }
             }
@@ -55,8 +58,8 @@ collections
                     state: "default" 0.0;
                     align: 0.0 0.0;
                     visible: 1;
-                    rel1 {relative: 0.80 0.0;}
-                    rel2 {relative: 1.0 0.10; }
+                    rel1 {relative: 0.0 0.40;}
+                    rel2 {relative: 1.0 (0.40 + TEXT_HEIGHT); }
                 }
             }
 
@@ -68,57 +71,36 @@ collections
                     align: 0.0 0.0;
                     visible: 1;
                     rel1{
-                        relative: 0.5 0.10;
+                        relative: 0.0 (0.38 + TEXT_HEIGHT);
                     }
                     rel2{
-                        relative: 1.0 0.60;
+                        relative: 1.0 0.52;
                     }
                 }
             }
-            
-                       part { name: "padding1";
-                type: SPACER;
-                description {
-                    state: "default" 0.0;
-                    rel1 { relative: 0.0 0.60; }
-                    rel2 { relative: 1.0 0.65; }
-                    fixed: 1 0;
-                }
-            }           
-                  
             part { name: "1txt_2cnt_3txt_4cnt_5btn";
                 type: SWALLOW;
                 description {
                     state: "default" 0.0;
                     rel1 { 
-                         relative: 0.0 0.65;
+                         relative: 0.0 0.52;
                                        }
                     rel2 { 
-                                                relative: 1.0 0.70; 
+                                                relative: 1.0 0.6; 
                     }
                     visible: 1;
                 }
             }
-            
-                       part { name: "padding2";
-                type: SPACER;
-                description {
-                    state: "default" 0.0;
-                    rel1 { relative: 0.0 0.70; }
-                    rel2 { relative: 1.0 1.0; }
-                    fixed: 1 0;
-                }
-            }
 
             part { name: "wearable_toolbar";
                                type: SWALLOW;
                                description {
                                        state: "default" 0.0;
                                        rel1 {
-                                               relative: 0.0 1.0;
+                                               relative: 0.0 0.6;
                                        }
                                        rel2 {
-                                               relative: 1.0 1.0;
+                                               relative: 1.0 0.8;
                                        }
                                        visible: 1;
                                }