From: ChunEon Park <chuneon.park@samsung.com>
Date: Fri, 6 Apr 2012 06:44:21 +0000 (+0900)
Subject: conformant - updated to sync with the lastest code
X-Git-Tag: 2.0_alpha~176
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4dea636dcda80889935e018bbdd7d8858d75011;p=framework%2Fuifw%2Fefl-theme-tizen.git

conformant - updated to sync with the lastest code
---

diff --git a/themes/widgets/conformant.edc b/themes/widgets/conformant.edc
index e390568..28b2786 100644
--- a/themes/widgets/conformant.edc
+++ b/themes/widgets/conformant.edc
@@ -24,13 +24,24 @@
            description { state: "default" 0.0;
               align: 0.5 0.5;
               rel2.relative: 1.0 0.0;
+              rel2.to_y: "elm.swallow.clipboard";
+           }
+        }
+        part { name: "elm.swallow.clipboard";
+           type: SWALLOW;
+           description { state: "default" 0.0;
+              fixed: 0 1;
+              align: 0.0 1.0;
+              rel1.relative: 0.0 0.0;
+              rel1.to_y: "elm.swallow.virtualkeypad";
+              rel2.relative: 1.0 0.0;
               rel2.to_y: "elm.swallow.virtualkeypad";
            }
         }
         part { name: "elm.swallow.virtualkeypad";
            type: SWALLOW;
            description { state: "default" 0.0;
-              fixed: 1 1;
+              fixed: 0 1;
               align: 0.0 1.0;
               rel1.relative: 0.0 1.0;
            }
@@ -40,7 +51,7 @@
 
  group { name: "elm/conformant/base/internal_layout";
      parts {
-        part { name: "elm.swallow.shelf";
+        part { name: "elm.swallow.indicator";
            type: SWALLOW;
            description { state: "default" 0.0;
               fixed: 1 1;
@@ -51,9 +62,21 @@
         part { name: "elm.swallow.content";
            type: SWALLOW;
            description { state: "default" 0.0;
+              fixed: 0 1;
               align: 0.5 0.5;
-              rel1.relative: 0.0 0.0; //overlap elm.swallow.shelf
-              rel1.to_y: "elm.swallow.shelf";
+              rel1.relative: 0.0 0.0;
+              rel1.to_y: "elm.swallow.indicator";
+              rel2.relative: 1.0 0.0;
+              rel2.to_y: "elm.swallow.clipboard";
+           }
+        }
+        part { name: "elm.swallow.clipboard";
+           type: SWALLOW;
+           description { state: "default" 0.0;
+              fixed: 0 1;
+              align: 0.0 1.0;
+              rel1.relative: 0.0 0.0;
+              rel1.to_y: "elm.swallow.virtualkeypad";
               rel2.relative: 1.0 0.0;
               rel2.to_y: "elm.swallow.virtualkeypad";
            }
@@ -67,7 +90,7 @@
            }
         }
      }
-  }
+ }
  group { name: "elm/conformant/layout/content";
     parts {
        part { name: "elm.swallow.content";