Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d468258 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add requested_corner_radius to layer proto" into sc-v2-dev am: 4eda418d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15553576

Change-Id: I46f56d3c0ab4ad831d980b657f7523ac15d0f143
parents 9c6d926e 4eda418d

services/surfaceflinger/Layer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2031,6 +2031,7 @@ void Layer::writeToProtoDrawingState(LayerProto* layerInfo, uint32_t traceFlags, 
        layerInfo->set_curr_frame(mCurrentFrameNumber);

        layerInfo->set_effective_scaling_mode(getEffectiveScalingMode());



        layerInfo->set_requested_corner_radius(getDrawingState().cornerRadius);

        layerInfo->set_corner_radius(getRoundedCornerState().radius);

        layerInfo->set_background_blur_radius(getBackgroundBlurRadius());

        layerInfo->set_is_trusted_overlay(isTrustedOverlay());

services/surfaceflinger/layerproto/layers.proto

+4 −1
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ message LayerProto { 
  repeated BlurRegion blur_regions = 54;



  bool is_trusted_overlay = 55;



  // Corner radius explicitly set on layer rather than inherited

  float requested_corner_radius = 56;

}



message PositionProto {