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

Commit 3df8c1aa authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename fold-unfold animation overlay and surface-container" into main

parents 73e875a6 b73d1296

packages/SystemUI/src/com/android/systemui/unfold/FoldLightRevealOverlayAnimation.kt

+2 −2
Original line number Diff line number Diff line
@@ -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)

    }

packages/SystemUI/src/com/android/systemui/unfold/FullscreenLightRevealAnimation.kt

+3 −3
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/src/com/android/systemui/unfold/UnfoldLightRevealOverlayAnimation.kt

+2 −2
Original line number Diff line number Diff line
@@ -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

    }

}