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

Commit 0c1714bb authored by Jon Miranda's avatar Jon Miranda Committed by Android (Google) Code Review
Browse files

Merge "Only draw transient taskbar background for transient taskbar" into tm-qpr-dev

parents 17137e8b f80b5f50

quickstep/src/com/android/launcher3/taskbar/TaskbarBackgroundRenderer.kt

+4 −2
Original line number Original line Diff line number Diff line
@@ -38,6 +38,8 @@ class TaskbarBackgroundRenderer(context: TaskbarActivityContext) { 
    private var maxBackgroundHeight = context.deviceProfile.taskbarSize.toFloat()

    private var maxBackgroundHeight = context.deviceProfile.taskbarSize.toFloat()

    private val transientBackgroundBounds = context.transientTaskbarBounds

    private val transientBackgroundBounds = context.transientTaskbarBounds





    private val isTransientTaskbar = DisplayController.isTransientTaskbar(context);



    private var shadowBlur = 0f

    private var shadowBlur = 0f

    private var keyShadowDistance = 0f

    private var keyShadowDistance = 0f

    private var bottomMargin = 0

    private var bottomMargin = 0
@@ -52,7 +54,7 @@ class TaskbarBackgroundRenderer(context: TaskbarActivityContext) { 
        paint.flags = Paint.ANTI_ALIAS_FLAG

        paint.flags = Paint.ANTI_ALIAS_FLAG

        paint.style = Paint.Style.FILL

        paint.style = Paint.Style.FILL





        if (DisplayController.isTransientTaskbar(context)) {

        if (isTransientTaskbar) {

            paint.color = context.getColor(R.color.transient_taskbar_background)

            paint.color = context.getColor(R.color.transient_taskbar_background)





            val res = context.resources

            val res = context.resources
@@ -81,7 +83,7 @@ class TaskbarBackgroundRenderer(context: TaskbarActivityContext) { 
    fun draw(canvas: Canvas) {

    fun draw(canvas: Canvas) {

        canvas.save()

        canvas.save()

        canvas.translate(0f, canvas.height - backgroundHeight - bottomMargin)

        canvas.translate(0f, canvas.height - backgroundHeight - bottomMargin)

        if (transientBackgroundBounds.isEmpty) {

        if (!isTransientTaskbar || transientBackgroundBounds.isEmpty) {

            // Draw the background behind taskbar content.

            // Draw the background behind taskbar content.

            canvas.drawRect(0f, 0f, canvas.width.toFloat(), backgroundHeight, paint)

            canvas.drawRect(0f, 0f, canvas.width.toFloat(), backgroundHeight, paint)