Modify layers.json and layout.db

layers.json
* Forgot to change the layer name

layout.db
* Change the name of area and layer
* Modify the size of area

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

diff --git a/layers.json b/layers.json
index 30dc8fd..bab1368 100644 (file)
--- a/layers.json
+++ b/layers.json
@@ -16,10 +16,10 @@
       },
       {
          "role": "^HomeScreen$",
-         "name": "HomeScreen",
+         "name": "FarHomeScreen",
          "layer_id": 1000,
          "area": { "type": "full" },
-         "comment": "Single layer map for the HomeScreen"
+         "comment": "FarHomeScreen is the part of HomeScreen, and lawer layer of z order for HomeScreen"
       },
       {
          "role": "Music|Video|WebBrowser|MediaPlayer|Radio|Phone|Navigation|HVAC|Settings|Dashboard|POI|Mixer|Splitable1|Splitable2|Fallback",
@@ -30,10 +30,10 @@
       },
       {
         "role": "SoftwareKeyboard",
-        "name": "UpperHomeScreen",
+        "name": "NearHomeScreen",
         "layer_id": 1002,
-        "area": { "type": "rect", "rect": { "x": 0, "y": 760, "width": -1, "height": 400 } },
-        "comment": "UpperHomeScreen is the part of HomeScreen"
+        "area": { "type": "rect", "rect": { "x": 0, "y": 760, "width": -1, "height": -1 } },
+        "comment": "NearHomeScreen is the part of HomeScreen, and upper layer of z order for HomeScreen"
       },
       {
         "role": "Restriction",

diff --git a/src/layout_manager/db/layout.db b/src/layout_manager/db/layout.db
index b8bf551..0de262f 100644 (file)
--- a/src/layout_manager/db/layout.db
+++ b/src/layout_manager/db/layout.db
@@ -94,7 +94,7 @@
             "layer": "homescreen",
             "areas": [
                 {
-                    "name": "",
+                    "name": "fullscreen",
                     "role": "homescreen"
                 }
             ]
@@ -197,16 +197,16 @@
     "areas": [
         "description": "The area is in the layer. The layout attaches areas to the layer"
         {
-            "name": "normal",
+            "name": "fullscreen",
             "rect": {
                 "x": 0,
-                "y": 218,
+                "y": 0,
                 "w": 1080,
-                "h": 1488
+                "h": 1920
             }
         },
         {
-            "name": "restriction.normal",
+            "name": "normal",
             "rect": {
                 "x": 0,
                 "y": 218,
@@ -215,7 +215,7 @@
             }
         },
         {
-            "name": "restriction.split.main",
+            "name": "split.main",
             "rect": {
                 "x": 0,
                 "y": 218,
@@ -224,7 +224,7 @@
             }
         },
         {
-            "name": "restriction.split.sub",
+            "name": "split.sub",
             "rect": {
                 "x": 0,
                 "y": 962,
@@ -233,7 +233,7 @@
             }
         },
         {
-            "name": "split.main",
+            "name": "software_keyboard",
             "rect": {
                 "x": 0,
                 "y": 962,
@@ -242,39 +242,39 @@
             }
         },
         {
-            "name": "split.sub",
+            "name": "restriction.normal",
             "rect": {
                 "x": 0,
-                "y": 962,
+                "y": 218,
                 "w": 1080,
-                "h": 744
+                "h": 1488
             }
         },
         {
-            "name": "fullscreen",
+            "name": "restriction.split.main",
             "rect": {
                 "x": 0,
-                "y": 0,
+                "y": 218,
                 "w": 1080,
-                "h": 1920
+                "h": 744
             }
         },
         {
-            "name": "pop_up",
+            "name": "restriction.split.sub",
             "rect": {
                 "x": 0,
-                "y": 640,
+                "y": 962,
                 "w": 1080,
-                "h": 640
+                "h": 744
             }
         },
         {
-            "name": "software_keyboard",
+            "name": "pop_up",
             "rect": {
                 "x": 0,
-                "y": 1162,
+                "y": 640,
                 "w": 1080,
-                "h": 544
+                "h": 640
             }
         },
         {