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

Commit 9844283b authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[SB Refactor] Override #getDrawingRect for the new views for a11y."... 

Merge "[SB Refactor] Override #getDrawingRect for the new views for a11y." into tm-qpr-dev am: d1ca0215

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



Change-Id: I072c5bf889aad05014c148cec1238393f9857d41
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3511eb54 d1ca0215

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarView.kt

+11 −0
Original line number Diff line number Diff line
@@ -77,6 +77,17 @@ open class ModernStatusBarView(context: Context, attrs: AttributeSet?) : 
        return binding.getShouldIconBeVisible()

    }



    /** See [StatusBarIconView.getDrawingRect]. */

    override fun getDrawingRect(outRect: Rect) {

        super.getDrawingRect(outRect)

        val translationX = translationX.toInt()

        val translationY = translationY.toInt()

        outRect.left += translationX

        outRect.right += translationX

        outRect.top += translationY

        outRect.bottom += translationY

    }



    /**

     * Initializes this view.

     *

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarViewTest.kt

+17 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.statusbar.pipeline.shared.ui.view



import android.graphics.Rect

import android.testing.AndroidTestingRunner

import android.testing.TestableLooper.RunWithLooper

import androidx.test.filters.SmallTest
@@ -118,6 +119,22 @@ class ModernStatusBarViewTest : SysuiTestCase() { 
        assertThat(view.isIconVisible).isEqualTo(false)

    }



    @Test

    fun getDrawingRect_takesTranslationIntoAccount() {

        val view = createAndInitView()



        view.translationX = 50f

        view.translationY = 60f



        val drawingRect = Rect()

        view.getDrawingRect(drawingRect)



        assertThat(drawingRect.left).isEqualTo(view.left + 50)

        assertThat(drawingRect.right).isEqualTo(view.right + 50)

        assertThat(drawingRect.top).isEqualTo(view.top + 60)

        assertThat(drawingRect.bottom).isEqualTo(view.bottom + 60)

    }



    private fun createAndInitView(): ModernStatusBarView {

        val view = ModernStatusBarView(context, null)

        binding = TestBinding()