Merge "Changed ContainerLayer's isVisible method to always return false." (1dd48f6b) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/ContainerLayer.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,10 @@ ContainerLayer::~ContainerLayer() = default;
		void ContainerLayer::onDraw(const RenderArea&, const Region& /* clip */, bool) {}

		bool ContainerLayer::isVisible() const {
		return false;
		}

		bool ContainerLayer::canReceiveInput() const {
		return !isHiddenByPolicy();
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,8 @@ public:
		bool useIdentityTransform) override;
		bool isVisible() const override;

		bool canReceiveInput() const override;

		void setPerFrameData(DisplayId displayId, const ui::Transform& transform, const Rect& viewport,
		int32_t supportedPerFrameMetadata) override;

+5 −1

Original line number	Diff line number	Diff line
		@@ -2206,7 +2206,7 @@ InputWindowInfo Layer::fillInputInfo() {
		// Position the touchable region relative to frame screen location and restrict it to frame
		// bounds.
		info.touchableRegion = info.touchableRegion.translate(info.frameLeft, info.frameTop);
		info.visible = isVisible();
		info.visible = canReceiveInput();
		return info;
		}

		@@ -2218,6 +2218,10 @@ std::shared_ptr<compositionengine::Layer> Layer::getCompositionLayer() const {
		return nullptr;
		}

		bool Layer::canReceiveInput() const {
		return isVisible();
		}

		// ---------------------------------------------------------------------------

		}; // namespace android

+5 −0

Original line number	Diff line number	Diff line
		@@ -386,6 +386,11 @@ public:
		*/
		bool isHiddenByPolicy() const;

		/*
		* Returns whether this layer can receive input.
		*/
		virtual bool canReceiveInput() const;

		/*
		* isProtected - true if the layer may contain protected content in the
		* GRALLOC_USAGE_PROTECTED sense.