util: add ability to disable afb logging macro usage

[staging/windowmanager.git] / layers.json

diff --git a/layers.json b/layers.json
index 280dd2e..c1107d4 100644 (file)
--- a/layers.json
+++ b/layers.json
@@ -7,26 +7,6 @@
       "comment": "This surface should never be made invisible (The HomeScreen)"
    },
 
-   "dynamic_ids_start": 16777216,
-
-   "layers": [
-      {
-         "name": "HomeScreen",
-         "layer_id": 1000,
-         "area": { "type": "full" }
-      },
-      {
-         "name": "Apps",
-         "layer_id": 1001,
-         "area": { "type": "rect", "rect": { "x": 0, "y": 100, "width": -1, "height": -201 } }
-      },
-      {
-         "name": "Popups",
-         "layer_id": 9999,
-         "area": { "type": "rect", "rect": { "x": 0, "y": 100, "width": -1, "height": -201 } }
-      }
-   ],
-
    "mappings": [
       {
          "type": "single",
@@ -45,7 +25,36 @@
          "name": "apps",
          "layer_id": 1001,
          "area": { "type": "rect", "rect": { "x": 0, "y": 100, "width": -1, "height": -201 } },
-         "comment": "Range of IDs that will always be placed on layer 1001, negative rect values are interpreted as output_size.dimension - $value"
+         "comment": "Range of IDs that will always be placed on layer 1001, negative rect values are interpreted as output_size.dimension - $value",
+
+         "split_layouts": [
+            {
+               "name": "Media Player",
+               "main_match": "^App MPlayer Main$",
+               "sub_match": "^App MPlayer Sub",
+               "priority": 500,
+               "comment": "All Media Player sub surfaces can be put in a sub layout with the Media Player"
+            },
+            {
+               "name": "Playlist",
+               "main_match": "",
+               "sub_match": "^App MPlayer Sub Playlist$",
+               "priority": 100,
+               "comment": "Always allow the media player playlist to be displayed as sub surface"
+            },
+            {
+               "name": "Map",
+               "main_match": "^App Navi Map",
+               "sub_match": "^App Navi Guidance",
+               "priority": 1000
+            },
+            {
+               "name": "App1 example",
+               "main_match": "^App1",
+               "sub_match": ".*",
+               "priority": 1000
+            }
+         ]
       },
       {
          "type": "range",
@@ -54,7 +63,7 @@
          "role": "^OnScreen.*",
          "name": "popups",
          "layer_id": 9999,
-         "area": { "type": "rect", "rect": { "x": 0, "y": 100, "width": -1, "height": -201 } },
+         "area": { "type": "rect", "rect": { "x": 0, "y": 300, "width": -1, "height": 400 } },
          "comment": "Range of IDs that will always be placed on the popup layer, that gets a very high 'dummy' id of 9999"
       }
    ],