From: Yuta Doi <yuta-d@witz-inc.co.jp>
Date: Fri, 22 Jun 2018 01:41:25 +0000 (+0900)
Subject: Move layout.db
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=6410fc2399e567541bbe9ee9ef3861af5eb45d84;p=apps%2Fagl-service-windowmanager.git

Move layout.db

Change-Id: I38e008245173fd4a7c2d4ae19e8baab85fbbb27d
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f2f1162..0819305 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -128,7 +128,7 @@ add_custom_command(TARGET ${TARGETS_WM} POST_BUILD
    COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/etc
    COMMAND cp -f ${PROJECT_SOURCE_DIR}/layers.json ${PROJECT_BINARY_DIR}/package/root/etc
    COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/layout_manager/db/area.db ${PROJECT_BINARY_DIR}/package/root/etc
-   COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/layout_manager/db/layout.db ${PROJECT_BINARY_DIR}/package/root/etc
+   COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/${PLUGIN_PM}/db/layout.db ${PROJECT_BINARY_DIR}/package/root/etc
    COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/${PLUGIN_PM}/db/role.db ${PROJECT_BINARY_DIR}/package/root/etc
    COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/db/app.db ${PROJECT_BINARY_DIR}/package/root/etc
    COMMAND cp -f ${PROJECT_BINARY_DIR}/src/policy_manager/libpolicy_manager.so ${PROJECT_BINARY_DIR}/package/root/lib
diff --git a/src/layout_manager/db/layout.db.org b/src/layout_manager/db/layout.db.org
deleted file mode 100644
index c7cefd8..0000000
--- a/src/layout_manager/db/layout.db.org
+++ /dev/null
@@ -1,158 +0,0 @@
-{
-    "layouts": [
-        {
-            "name": "pu",
-            "layer": "on_screen",
-            "areas": [
-                {
-                    "name": "pop_up",
-                    "role": "incomming_call"
-                }
-            ]
-        },
-        {
-            "name": "sa",
-            "layer": "on_screen",
-            "areas": [
-                {
-                    "name": "system_alert",
-                    "role": "system_alert"
-                }
-            ]
-        },
-        {
-            "name": "m1",
-            "layer": "apps",
-            "areas": [
-                {
-                    "name": "normal",
-                    "role": "map"
-                }
-            ]
-        },
-        {
-            "name": "m2",
-            "layer": "apps",
-            "areas": [
-                {
-                    "name": "split.main",
-                    "role": "map"
-                },
-                {
-                    "name": "split.sub",
-                    "category": "splitable"
-                }
-            ]
-        },
-        {
-            "name": "mf",
-            "layer": "apps",
-            "areas": [
-                {
-                    "name": "full",
-                    "role": "map"
-                }
-            ]
-        },
-        {
-            "name": "s1",
-            "layer": "apps",
-            "areas": [
-                {
-                    "name": "normal",
-                    "category": "splitable"
-                }
-            ]
-        },
-        {
-            "name": "s2",
-            "layer": "apps",
-            "areas": [
-                {
-                    "name": "split.main",
-                    "category": "splitable"
-                },
-                {
-                    "name": "split.sub",
-                    "category": "splitable"
-                }
-            ]
-        },
-        {
-            "name": "g",
-            "layer": "apps",
-            "areas": [
-                {
-                    "name": "normal",
-                    "category": "general"
-                }
-            ]
-        },
-        {
-            "name": "hs",
-            "layer": "homescreen",
-            "areas": [
-                {
-                    "name": "full",
-                    "role": "homescreen"
-                }
-            ]
-        }
-    ],
-    "areas": [
-        {
-            "name": "normal",
-            "rect": {
-                "x": 0,
-                "y": 218,
-                "w": 1080,
-                "h": 1488
-            }
-        },
-        {
-            "name": "split.main",
-            "rect": {
-                "x": 0,
-                "y": 218,
-                "w": 1080,
-                "h": 744
-            }
-        },
-        {
-            "name": "split.sub",
-            "rect": {
-                "x": 0,
-                "y": 962,
-                "w": 1080,
-                "h": 744
-            }
-        },
-        {
-            "name": "full",
-            "rect": {
-                "x": 0,
-                "y": 0,
-                "w": 1080,
-                "h": 1920
-            }
-        },
-        {
-            "name": "pop_up",
-            "rect": {
-                "x": 0,
-                "y": 640,
-                "w": 1080,
-                "h": 640
-            }
-        },
-        {
-            "name": "system_alert",
-            "rect": {
-                "x": 0,
-                "y": 640,
-                "w": 1080,
-                "h": 640
-            }
-        }
-    ]
-}
diff --git a/src/layout_manager/db/layout.db b/src/policy_manager/db/layout.db
similarity index 100%
rename from src/layout_manager/db/layout.db
rename to src/policy_manager/db/layout.db