[Accessibility] Fix Universal Switch layouts in vertical view 39/150439/2
authorPawel Kurowski <p.kurowski2@samsung.com>
Fri, 15 Sep 2017 14:36:43 +0000 (16:36 +0200)
committerPawel Kurowski <p.kurowski2@samsung.com>
Mon, 18 Sep 2017 10:25:47 +0000 (12:25 +0200)
Change-Id: Id20cca8cc9667cfc58aaa029e30ce703af1c27fd

resource/accessibility-settings-set-value.edc

index 0ef664e6f0b20e565f9eeb9fa3aea33088379b4f..0305ff28ac922bc15bcad985fde0ce918de77318 100644 (file)
@@ -19,7 +19,6 @@
  *
  */
 
-#define LAYOUT_HEIGHT 1130
 #define SELECTOR_ITEM_COUNT 5
 #define SELECTOR_ITEM_HEIGHT 65
 
@@ -176,8 +175,6 @@ collections {
                                        text.style: TXT_STYLE_RANGE;
                                        text.text: "";
                                        align: 0 0;
-                                       min: 0 LAYOUT_HEIGHT*0.1;
-                                       max: -1 LAYOUT_HEIGHT*0.1;
                                        fixed: 0 1;
                                }
                        }
@@ -214,41 +211,38 @@ collections {
                                }
                        }
 
-                       part {
+               part {
                                name: PRT_SET_VALUE_SWITCH_BG;
                                type: RECT;
                                description {
                                        state: "default" 0.0;
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 1.0 0.1;
+                                       rel1.relative: 0.0 0;
+                                       rel2.relative: 1.0 0;
+                                       min: 0 180;
                                        color: 224 224 224 255;
                                }
-                       }
 
-                       part {
-                               name: PRT_SET_VALUE_SWITCH_LABEL;
-                               type: TEXTBLOCK;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1.relative: 0.1 0.0;
-                                       rel1.to: PRT_SET_VALUE_SWITCH_BG;
-                                       rel2.relative: 0.5 1.0;
-                                       rel2.to: PRT_SET_VALUE_SWITCH_BG;
-                                       text.style: TXT_STYLE_SWITCH;
-                                       text.text: "";
-                                       text.align: 0.0 0.5;
+                               part {
+                                       name: PRT_SET_VALUE_SWITCH;
+                                       type: SWALLOW;
+                                       description {
+                                               state: "default" 0.0;
+                                               rel1.relative: 0.9 0.5;
+                                               rel2.relative: 0.9 1.0;
+                                       }
                                }
-                       }
 
-                       part {
-                               name: PRT_SET_VALUE_SWITCH;
-                               type: SWALLOW;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1.relative: 0.8 0.0;
-                                       rel1.to: PRT_SET_VALUE_SWITCH_BG;
-                                       rel2.relative: 0.9 1.0;
-                                       rel2.to: PRT_SET_VALUE_SWITCH_BG;
+                               part {
+                                       name: PRT_SET_VALUE_SWITCH_LABEL;
+                                       type: TEXTBLOCK;
+                                       description {
+                                               state: "default" 0.0;
+                                               rel1.relative: 0.1 0.5;
+                                               rel2.relative: 0.5 1.0;
+                                               text.style: TXT_STYLE_SWITCH;
+                                               text.text: "";
+                                               text.align: 0.0 0.5;
+                                       }
                                }
                        }
 
@@ -259,7 +253,7 @@ collections {
                                        state: "default" 0.0;
                                        rel1.relative: 0.0 1.0;
                                        rel1.to: PRT_SET_VALUE_SWITCH;
-                                       rel2.relative: 1.0 1/LAYOUT_HEIGHT;
+                                       rel2.relative: 1.0 0.0;
                                        rel2.to_x: PRT_SET_VALUE_SWITCH;
                                        rel2.to_y: PRT_SET_VALUE_BG;
                                        visible: 0;
@@ -279,8 +273,9 @@ collections {
                                        rel1.relative: 0.05 1.0;
                                        rel1.to_x: PRT_SET_VALUE_BG;
                                        rel1.to_y: PRT_SET_VALUE_SEP_1;
-                                       rel2.relative: 0.95 0.2;
-                                       rel2.to: PRT_SET_VALUE_BG;
+                                       rel2.relative: 0.95 1.5;
+                                       min: 0 100;
+                                       rel2.to: PRT_SET_VALUE_SWITCH_BG;
                                        text.style: TXT_STYLE_VALUE;
                                        text.text: "";
                                }
@@ -294,7 +289,7 @@ collections {
                                        rel1.relative: 0.05 1.0;
                                        rel1.to_x: PRT_SET_VALUE_BG;
                                        rel1.to_y: PRT_SET_VALUE_VALUE;
-                                       rel2.relative: 0.95 1/LAYOUT_HEIGHT;
+                                       rel2.relative: 0.95 0.0;
                                        align: 0 0;
                                        min: 0 1;
                                        max: -1 1;
@@ -341,7 +336,7 @@ collections {
                                        state: "default" 0.0;
                                        rel1.relative: 0.0 1.0;
                                        rel1.to: PRT_SET_VALUE_SELECTOR;
-                                       rel2.relative: 1.0 1/LAYOUT_HEIGHT;
+                                       rel2.relative: 1.0 0.0;
                                        rel2.to_x: PRT_SET_VALUE_SELECTOR;
                                        rel2.to_y: PRT_SET_VALUE_BG;
                                        align: 0 0;
@@ -365,8 +360,6 @@ collections {
                                        text.style: TXT_STYLE_RANGE;
                                        text.text: "";
                                        align: 0 0;
-                                       min: 0 LAYOUT_HEIGHT*0.1;
-                                       max: -1 LAYOUT_HEIGHT*0.1;
                                        fixed: 0 1;
                                }
                        }
@@ -462,36 +455,33 @@ collections {
                                type: RECT;
                                description {
                                        state: "default" 0.0;
-                                       rel1.relative: 0.0 0.0;
-                                       rel2.relative: 1.0 0.1;
+                                       rel1.relative: 0.0 0;
+                                       rel2.relative: 1.0 0;
+                                       min: 0 180;
                                        color: 224 224 224 255;
                                }
-                       }
 
-                       part {
-                               name: PRT_SET_VALUE_SWITCH_LABEL;
-                               type: TEXTBLOCK;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1.relative: 0.1 0.0;
-                                       rel1.to: PRT_SET_VALUE_SWITCH_BG;
-                                       rel2.relative: 0.5 1.0;
-                                       rel2.to: PRT_SET_VALUE_SWITCH_BG;
-                                       text.style: TXT_STYLE_SWITCH;
-                                       text.text: "";
-                                       text.align: 0.0 0.5;
+                               part {
+                                       name: PRT_SET_VALUE_SWITCH;
+                                       type: SWALLOW;
+                                       description {
+                                               state: "default" 0.0;
+                                               rel1.relative: 0.9 0.5;
+                                               rel2.relative: 0.9 1.0;
+                                       }
                                }
-                       }
 
-                       part {
-                               name: PRT_SET_VALUE_SWITCH;
-                               type: SWALLOW;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1.relative: 0.8 0.0;
-                                       rel1.to: PRT_SET_VALUE_SWITCH_BG;
-                                       rel2.relative: 0.9 1.0;
-                                       rel2.to: PRT_SET_VALUE_SWITCH_BG;
+                               part {
+                                       name: PRT_SET_VALUE_SWITCH_LABEL;
+                                       type: TEXTBLOCK;
+                                       description {
+                                               state: "default" 0.0;
+                                               rel1.relative: 0.1 0.5;
+                                               rel2.relative: 0.5 1.0;
+                                               text.style: TXT_STYLE_SWITCH;
+                                               text.text: "";
+                                               text.align: 0.0 0.5;
+                                       }
                                }
                        }
 
@@ -502,7 +492,7 @@ collections {
                                        state: "default" 0.0;
                                        rel1.relative: 0.0 1.0;
                                        rel1.to: PRT_SET_VALUE_SWITCH;
-                                       rel2.relative: 1.0 1/LAYOUT_HEIGHT;
+                                       rel2.relative: 1.0 0.0;
                                        rel2.to_x: PRT_SET_VALUE_SWITCH;
                                        rel2.to_y: PRT_SET_VALUE_BG;
                                        visible: 0;
@@ -522,8 +512,9 @@ collections {
                                        rel1.relative: 0.05 1.0;
                                        rel1.to_x: PRT_SET_VALUE_BG;
                                        rel1.to_y: PRT_SET_VALUE_SEP_1;
-                                       rel2.relative: 0.95 0.2;
-                                       rel2.to: PRT_SET_VALUE_BG;
+                                       rel2.relative: 0.95 1.5;
+                                       min: 0 100;
+                                       rel2.to: PRT_SET_VALUE_SWITCH_BG;
                                        text.style: TXT_STYLE_DESC;
                                        text.text: "Description text";
                                        text.align: 0.0 0.5;