| commit | 6d468258e0b6b92a9a6d0b152a75fd8f88bfd1ab | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Aug 16 11:41:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 16 11:41:26 2021 +0000 |
| tree | a666da02cd8f015293f08a97c84a347a82075d96 | |
| parent | 9c6d926e30c058c6dac97f936e71a7deac797f52 [diff] | |
| parent | 4eda418d430d1a093c4431568082f49a341c3551 [diff] |
Merge "Add requested_corner_radius to layer proto" into sc-v2-dev am: 4eda418d43 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15553576 Change-Id: I46f56d3c0ab4ad831d980b657f7523ac15d0f143
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 28c8213..cc7ff16 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp
@@ -2031,6 +2031,7 @@ 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());
diff --git a/services/surfaceflinger/layerproto/layers.proto b/services/surfaceflinger/layerproto/layers.proto index dddc677..9f4e7d2 100644 --- a/services/surfaceflinger/layerproto/layers.proto +++ b/services/surfaceflinger/layerproto/layers.proto
@@ -130,6 +130,9 @@ 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 { @@ -228,4 +231,4 @@ int32 top = 8; int32 right = 9; int32 bottom = 10; -} \ No newline at end of file +}