From db66e627ad8904491e384c64f82fc77a939b9705 Mon Sep 17 00:00:00 2001 From: Robert Carr Date: Mon, 10 Apr 2017 16:55:57 -0700 Subject: SurfaceFlinger: Add parent-less relative layering. This is a temporary functionality for the intermediate state where not all child-surface like things in WM land are ported to use Child Surfaces. In particular, we have ported SurfaceView to use child surfaces and relative Z ordering. However the TV frameworks provide a View framework component which overlays views over the SurfaceView but below the main application window. Since we have not ported View framework surfaces to use child layers, there is nothing the WM or View Framework can do about this situation. Luckily the WM API's to have requested this are @hide but we have the one media framework component using it. In order to solve this issue we provide a method to set Z ordering relative to another window without inheriting its coordinate space as a child window would. This way the WM can recognize these TYPE_APPLICATION_MEDIA_OVERLAY windows and Z-order them at -1 with respect to the parents (and the SurfaceView can be at -2). Test: Included in transaction tests. Also manual test of bug repro steps with accomp frameworks/base CL Bug: 36693738 Change-Id: I921852d3d34f67f79ec745b9703f9e679867e7a1 --- libs/gui/SurfaceControl.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libs/gui/SurfaceControl.cpp') diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp index 7a68f1174a..bf8a815fe6 100644 --- a/libs/gui/SurfaceControl.cpp +++ b/libs/gui/SurfaceControl.cpp @@ -102,11 +102,19 @@ status_t SurfaceControl::setLayerStack(uint32_t layerStack) { if (err < 0) return err; return mClient->setLayerStack(mHandle, layerStack); } + status_t SurfaceControl::setLayer(int32_t layer) { status_t err = validate(); if (err < 0) return err; return mClient->setLayer(mHandle, layer); } + +status_t SurfaceControl::setRelativeLayer(const sp& relativeTo, int32_t layer) { + status_t err = validate(); + if (err < 0) return err; + return mClient->setRelativeLayer(mHandle, relativeTo, layer); +} + status_t SurfaceControl::setPosition(float x, float y) { status_t err = validate(); if (err < 0) return err; -- cgit v1.2.3-59-g8ed1b