X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=layers.json;h=9b16e081d9e036cd8cc1405d0f433da93bf04ad8;hb=refs%2Fheads%2Feel;hp=0d5a817605e362c0016c7a3401351064fa06c659;hpb=793166f301c058503c37553204c4d4c2b106ff23;p=staging%2Fwindowmanager.git diff --git a/layers.json b/layers.json index 0d5a817..9b16e08 100644 --- a/layers.json +++ b/layers.json @@ -2,15 +2,12 @@ "comment": "Surface ID to Layer ID mapping", "main_surface": { - "surface_id": 1000, "surface_role": "HomeScreen", "comment": "This surface should never be made invisible (The HomeScreen)" }, "mappings": [ { - "type": "single", - "surface_id": 1000, "role": "^HomeScreen$", "name": "HomeScreen", "layer_id": 1000, @@ -18,9 +15,6 @@ "comment": "Single layer map for the HomeScreen, XXX: type is redundant, could also check existence of id/first_id+last_id" }, { - "type": "range", - "first_surface_id": 2000, - "last_surface_id": 2999, "role": "^App.*", "name": "apps", "layer_id": 1001, @@ -57,27 +51,11 @@ ] }, { - "type": "range", - "first_surface_id": 3000, - "last_surface_id": 3999, "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" } - ], - - "tests": [ - { "surface_id": 1000, "expect_layer_id": 1000 }, - { "surface_id": 1001, "expect_layer_id": -1, "comment": "check against -1 for not found entries" }, - { "surface_id": 1999, "expect_layer_id": -1 }, - { "surface_id": 2000, "expect_layer_id": 1001 }, - { "surface_id": 2500, "expect_layer_id": 1001 }, - { "surface_id": 2999, "expect_layer_id": 1001 }, - { "surface_id": 3000, "expect_layer_id": 9999 }, - { "surface_id": 3500, "expect_layer_id": 9999 }, - { "surface_id": 3999, "expect_layer_id": 9999 }, - { "surface_id": 4711, "expect_layer_id": -1 } ] }