Change the role and layout

role
* upper homescreen -> near_homescreen
* lower homescreen -> far_homescreen
* restriction.* -> restriction

Change-Id: I5d53a66b8dc3d3b9cb761b27b7b388661853fd32
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

diff --git a/src/layout_manager/db/layout.db b/src/layout_manager/db/layout.db
index 3840ec5..b8bf551 100644 (file)
--- a/src/layout_manager/db/layout.db
+++ b/src/layout_manager/db/layout.db
@@ -115,7 +115,7 @@
             "areas": [
                 {
                     "name": "restriction.normal",
-                    "role": "restriction.video_hide_on_driving"
+                    "role": "restriction"
                 }
             ]
         },
@@ -125,7 +125,7 @@
             "areas": [
                 {
                     "name": "restriction.split.main",
-                    "role": "restriction.video_hide_on_driving"
+                    "role": "restriction"
                 }
             ]
         },
@@ -135,13 +135,13 @@
             "areas": [
                 {
                     "name": "restriction.split.sub",
-                    "role": "restriction.video_hide_on_driving"
+                    "role": "restriction"
                 }
             ]
         },
         {
-            "name": "upper_homescreen",
-            "layer": "upper_homescreen",
+            "name": "software_keyboard",
+            "layer": "near_homescreen",
             "areas": [
                 {
                     "name": "software_keyboard",
@@ -184,8 +184,8 @@
             ]
         },
         {
-            "name": "lower_homescreen",
-            "layer": "lower_homescreen",
+            "name": "far_homescreen",
+            "layer": "far_homescreen",
             "areas": [
                 {
                     "name": "fullscreen",

diff --git a/src/policy_manager/db/role.db b/src/policy_manager/db/role.db
index bcc0bbe..247aab2 100644 (file)
--- a/src/policy_manager/db/role.db
+++ b/src/policy_manager/db/role.db
@@ -7,7 +7,7 @@
     },
     {
         "category": "restriction",
-        "role": "restriction.video_hide_on_driving",
+        "role": "restriction",
         "area": "normal | restriction.split.main | restriction.split.sub",
     },
     {