diff options
3 files changed, 7 insertions, 7 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/unfold/FoldLightRevealOverlayAnimation.kt b/packages/SystemUI/src/com/android/systemui/unfold/FoldLightRevealOverlayAnimation.kt index 9faa84ea9120..c5e98a1f1c02 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/FoldLightRevealOverlayAnimation.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/FoldLightRevealOverlayAnimation.kt @@ -91,7 +91,7 @@ constructor( controllerFactory.create( displaySelector = { minByOrNull { it.naturalWidth } }, effectFactory = { LinearSideLightRevealEffect(it.isVerticalRotation()) }, - overlayContainerName = SURFACE_CONTAINER_NAME + overlayContainerName = OVERLAY_TITLE ) controller.init() @@ -196,7 +196,7 @@ constructor( private companion object { const val TAG = "FoldLightRevealOverlayAnimation" const val WAIT_FOR_ANIMATION_TIMEOUT_MS = 2000L - const val SURFACE_CONTAINER_NAME = "fold-overlay-container" + const val OVERLAY_TITLE = "fold-animation-overlay" val ANIMATION_DURATION: Long get() = SystemProperties.getLong("persist.fold_animation_duration", 200L) } diff --git a/packages/SystemUI/src/com/android/systemui/unfold/FullscreenLightRevealAnimation.kt b/packages/SystemUI/src/com/android/systemui/unfold/FullscreenLightRevealAnimation.kt index f368cac53dbb..a92137766c49 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/FullscreenLightRevealAnimation.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/FullscreenLightRevealAnimation.kt @@ -73,7 +73,7 @@ constructor( @Main private val executor: Executor, @Assisted private val displaySelector: List<DisplayInfo>.() -> DisplayInfo?, @Assisted private val lightRevealEffectFactory: (rotation: Int) -> LightRevealEffect, - @Assisted private val overlayContainerName: String + @Assisted private val overlayTitle: String ) { private lateinit var bgExecutor: Executor @@ -156,7 +156,7 @@ constructor( val containerBuilder = SurfaceControl.Builder(SurfaceSession()) .setContainerLayer() - .setName(overlayContainerName) + .setName("FoldUnfoldAnimationContainer") displayAreaHelper .get() @@ -224,7 +224,7 @@ constructor( } format = PixelFormat.TRANSLUCENT type = WindowManager.LayoutParams.TYPE_DISPLAY_OVERLAY - title = javaClass.simpleName + title = overlayTitle layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS fitInsetsTypes = 0 diff --git a/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt b/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt index f355dd84e3cb..666e75f20b7f 100644 --- a/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt +++ b/packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt @@ -71,7 +71,7 @@ constructor( fullscreenLightRevealAnimationControllerFactory.create( displaySelector = { maxByOrNull { it.naturalWidth } }, effectFactory = { LinearLightRevealEffect(it.isVerticalRotation()) }, - overlayContainerName = SURFACE_CONTAINER_NAME, + overlayContainerName = OVERLAY_TITLE, ) controller.init() bgExecutor = threadFactory.buildDelayableExecutorOnHandler(unfoldProgressHandler) @@ -194,7 +194,7 @@ constructor( private companion object { const val TAG = "UnfoldLightRevealOverlayAnimation" - const val SURFACE_CONTAINER_NAME = "unfold-overlay-container" + const val OVERLAY_TITLE = "unfold-animation-overlay" const val UNFOLD_BLOCK_TOUCHES_UNTIL_PROGRESS = 0.8f } } |