X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging%2Fwindowmanager.git;a=blobdiff_plain;f=layers.json;fp=layers.json;h=9b16e081d9e036cd8cc1405d0f433da93bf04ad8;hp=c1107d48d5e1232b0242a53d96ccc65cf652e125;hb=a414f394e06111d761ca6ac0aa783d59a42c6ea8;hpb=69a5f240268953b43aa89fdf414589ae3421aefc diff --git a/layers.json b/layers.json index c1107d4..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": 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 } ] }