Attach application to ivi-layer not to surface

Window Manager expresses the application in ivi-layer.
So for, Window Manager tied the surface and role applied
by the application. This patch associates the application
with the ivi-layer, and the role and surface are the
attributes that makes up the application.

Bug-AGL: SPEC-1818, SPEC-1635

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

1 files changed, 52 insertions, 45 deletions

diff --git a/layers.json b/layers.json
index 44e2adb..539846a 100644
--- a/layers.json
+++ b/layers.json
@@ -1,47 +1,54 @@
 {
-   "comment": "Surface ID to Layer ID mapping",
-
-   "main_surface": {
-      "surface_role": "HomeScreen",
-      "comment": "This surface should never be made invisible (The HomeScreen)"
-   },
-
-   "mappings": [
-      {
-         "role": "BackGroundLayer",
-         "name": "BackGroundLayer",
-         "layer_id": 999,
-         "comment": "Single BackGround layer map for the map, radio, music and video"
-      },
-      {
-         "role": "homescreen",
-         "name": "FarHomeScreen",
-         "layer_id": 1000,
-         "comment": "FarHomeScreen is the part of HomeScreen. The z order of this layer is lower than NearHomeScreen"
-      },
-      {
-         "role": "music|video|browser|radio|phone|navigation|map|hvac|settings|dashboard|poi|mixer|sdl|launcher|fallback",
-         "name": "Apps",
-         "layer_id": 1001,
-         "comment": "Range of IDs that will always be placed on layer 1001"
-      },
-      {
-        "role": "software_keyboard",
-        "name": "NearHomeScreen",
-        "layer_id": 1002,
-        "comment": "NearHomeScreen is the part of HomeScreen. The z order of this layer is upper than FarHomeScreen"
-      },
-      {
-        "role": "restriction",
-        "name": "Restriction",
-        "layer_id": 1003,
-        "comment": "This layer is for restriction notification. This is used by restriction role"
-      },
-      {
-         "role": "^on_screen.*",
-         "name": "OnScreen",
-         "layer_id": 9999,
-         "comment": "Range of IDs that will always be placed on the OnScreen layer, that gets a very high 'dummy' id of 9999"
-      }
-   ]
+    "description": "Layer mapping",
+    "mappings": [
+        {
+            "name": "BackGroundLayer",
+            "role" : "navigation|radio|music|video",
+            "id_range_begin": 0,
+            "id_range_end": 0,
+            "comment": "Work Around: This is a special fallback layer that not stopping wayland event loop."
+        },
+        {
+            "name": "FarHomeScreen",
+            "role": "homescreen",
+            "id_range_begin": 100,
+            "id_range_end": 199,
+            "comment": "FarHomeScreen is the part of HomeScreen. The z order of this layer is lower than NearHomeScreen"
+        },
+        {
+            "name": "Apps",
+            "role": "music|video|browser|radio|phone|navigation|map|hvac|settings|dashboard|poi|mixer|sdl|launcher|fallback",
+            "id_range_begin": 1000,
+            "id_range_end": 2999,
+            "comment": "Application layer"
+        },
+        {
+            "name": "NearHomeScreen",
+            "role": "software_keyboard",
+            "id_range_begin": 3000,
+            "id_range_end": 3999,
+            "comment": "NearHomeScreen is the part of HomeScreen. The usecase is used by software_keyboard etc"
+        },
+        {
+            "name": "Popup",
+            "role": "popup*",
+            "id_range_begin": 4000,
+            "id_range_end": 4999,
+            "comment": "This layer is for popup application layer"
+        },
+        {
+            "name": "Restriction",
+            "role": "restriction",
+            "id_range_begin": 5000,
+            "id_range_end": 5999,
+            "comment": "This layer is for restriction notification on driving. This is used by restriction role"
+        },
+        {
+            "name": "OnScreen",
+            "role": "^on_screen.*",
+            "id_range_begin": 6000,
+            "id_range_end": 6999,
+            "comment": "System notification layer. For example, on_screen_low_battery_alert to notify user"
+        }
+    ]
 }