projects / platform / core / uifw / e17-misc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0eec089)
Merge with devel 59/16859/1
authorGwanglim Lee <gl77.lee@samsung.com>
Thu, 27 Jun 2013 01:57:48 +0000 (10:57 +0900)
committerSeunghun Lee <shiin.lee@samsung.com>
Tue, 25 Feb 2014 10:19:26 +0000 (19:19 +0900)
Change-Id: I3f07560fee83e92e7304be4fa65b86c15830e81d

arm/opt/home/app/.e/e/config/samsung/e.src patch | blob | history
arm/opt/home/app/.e/e/config/samsung/module.move-tizen.src patch | blob | history
emulator/opt/home/app/.e/e/config/samsung/e.src patch | blob | history
emulator/opt/home/app/.e/e/config/samsung/module.move-tizen.src patch | blob | history
i386/opt/home/app/.e/e/config/samsung/e.src patch | blob | history
i386/opt/home/app/.e/e/config/samsung/module.move-tizen.src patch | blob | history

diff --git a/arm/opt/home/app/.e/e/config/samsung/e.src b/arm/opt/home/app/.e/e/config/samsung/e.src
index 123df4b..aba3eb7 100644 (file)
--- a/arm/opt/home/app/.e/e/config/samsung/e.src
+++ b/arm/opt/home/app/.e/e/config/samsung/e.src
@@ -76,6 +76,12 @@ group "E_Config" struct {
             value "priority" int: -3000;
         }
         group "E_Config_Module" struct {
+            value "name" string: "devmode-tizen";
+            value "enabled" uchar: 0;
+            value "delayed" uchar: 1;
+            value "priority" int: -4000;
+        }
+        group "E_Config_Module" struct {
             value "name" string: "gadman";
             value "enabled" uchar: 1;
             value "delayed" uchar: 0;
diff --git a/arm/opt/home/app/.e/e/config/samsung/module.move-tizen.src b/arm/opt/home/app/.e/e/config/samsung/module.move-tizen.src
index f44515b..b7fd2d7 100644 (file)
--- a/arm/opt/home/app/.e/e/config/samsung/module.move-tizen.src
+++ b/arm/opt/home/app/.e/e/config/samsung/module.move-tizen.src
@@ -33,20 +33,7 @@ group "Move_Config" struct {
     value "indicator_widget_geometry[E_MOVE_ANGLE_270].y" int: 0;
     value "indicator_widget_geometry[E_MOVE_ANGLE_270].w" int: 50;
     value "indicator_widget_geometry[E_MOVE_ANGLE_270].h" int: 1280;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].x" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].y" int: 1260;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].w" int: 720;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].h" int: 20;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].x" int: 700;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].y" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].w" int: 20;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].h" int: 1280;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].x" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].y" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].w" int: 720;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].h" int: 20;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].x" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].y" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].w" int: 20;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].h" int: 1280;
+    value "apptray_launch_by_flickup" uchar: 1;
+    value "apptray_widget_size.portrait" int: 20;
+    value "apptray_widget_size.landscape" int: 20;
 }
diff --git a/emulator/opt/home/app/.e/e/config/samsung/e.src b/emulator/opt/home/app/.e/e/config/samsung/e.src
index 2eb28d3..de6b37c 100644 (file)
--- a/emulator/opt/home/app/.e/e/config/samsung/e.src
+++ b/emulator/opt/home/app/.e/e/config/samsung/e.src
@@ -239,6 +239,12 @@ group "E_Config" struct {
             value "delayed" uchar: 0;
             value "priority" int: 0;
         }
+        group "E_Config_Module" struct {
+            value "name" string: "devmode-tizen";
+            value "enabled" uchar: 0;
+            value "delayed" uchar: 1;
+            value "priority" int: -4000;
+        }
     }
     group "desktop_window_profiles" list {
         group "E_Config_Desktop_Window_Profile" struct {
diff --git a/emulator/opt/home/app/.e/e/config/samsung/module.move-tizen.src b/emulator/opt/home/app/.e/e/config/samsung/module.move-tizen.src
index f44515b..b7fd2d7 100644 (file)
--- a/emulator/opt/home/app/.e/e/config/samsung/module.move-tizen.src
+++ b/emulator/opt/home/app/.e/e/config/samsung/module.move-tizen.src
@@ -33,20 +33,7 @@ group "Move_Config" struct {
     value "indicator_widget_geometry[E_MOVE_ANGLE_270].y" int: 0;
     value "indicator_widget_geometry[E_MOVE_ANGLE_270].w" int: 50;
     value "indicator_widget_geometry[E_MOVE_ANGLE_270].h" int: 1280;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].x" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].y" int: 1260;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].w" int: 720;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].h" int: 20;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].x" int: 700;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].y" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].w" int: 20;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].h" int: 1280;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].x" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].y" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].w" int: 720;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].h" int: 20;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].x" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].y" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].w" int: 20;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].h" int: 1280;
+    value "apptray_launch_by_flickup" uchar: 1;
+    value "apptray_widget_size.portrait" int: 20;
+    value "apptray_widget_size.landscape" int: 20;
 }
diff --git a/i386/opt/home/app/.e/e/config/samsung/e.src b/i386/opt/home/app/.e/e/config/samsung/e.src
index 2eb28d3..de6b37c 100644 (file)
--- a/i386/opt/home/app/.e/e/config/samsung/e.src
+++ b/i386/opt/home/app/.e/e/config/samsung/e.src
@@ -239,6 +239,12 @@ group "E_Config" struct {
             value "delayed" uchar: 0;
             value "priority" int: 0;
         }
+        group "E_Config_Module" struct {
+            value "name" string: "devmode-tizen";
+            value "enabled" uchar: 0;
+            value "delayed" uchar: 1;
+            value "priority" int: -4000;
+        }
     }
     group "desktop_window_profiles" list {
         group "E_Config_Desktop_Window_Profile" struct {
diff --git a/i386/opt/home/app/.e/e/config/samsung/module.move-tizen.src b/i386/opt/home/app/.e/e/config/samsung/module.move-tizen.src
index f44515b..b7fd2d7 100644 (file)
--- a/i386/opt/home/app/.e/e/config/samsung/module.move-tizen.src
+++ b/i386/opt/home/app/.e/e/config/samsung/module.move-tizen.src
@@ -33,20 +33,7 @@ group "Move_Config" struct {
     value "indicator_widget_geometry[E_MOVE_ANGLE_270].y" int: 0;
     value "indicator_widget_geometry[E_MOVE_ANGLE_270].w" int: 50;
     value "indicator_widget_geometry[E_MOVE_ANGLE_270].h" int: 1280;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].x" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].y" int: 1260;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].w" int: 720;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_0].h" int: 20;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].x" int: 700;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].y" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].w" int: 20;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_90].h" int: 1280;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].x" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].y" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].w" int: 720;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_180].h" int: 20;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].x" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].y" int: 0;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].w" int: 20;
-    value "mini_apptray_widget_geometry[E_MOVE_ANGLE_270].h" int: 1280;
+    value "apptray_launch_by_flickup" uchar: 1;
+    value "apptray_widget_size.portrait" int: 20;
+    value "apptray_widget_size.landscape" int: 20;
 }
Domain: Graphics System / X Window Manager;