| commit | b4ee4ef146f62c679af2656a35b3dbd027d14edc | [log] [tgz] |
|---|---|---|
| author | Caitlin Shkuratov <caitlinshk@google.com> | Tue Jan 31 17:10:26 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 31 17:10:26 2023 +0000 |
| tree | e4e333df560afa72df1885c6a5dd40423648c486 | |
| parent | a843d7bc39861a39c645988f973670879b6ec132 [diff] | |
| parent | 9844283b8a391a922fa763d1a87a193b99b448c4 [diff] |
Merge "[SB Refactor] Override #getDrawingRect for the new views for a11y." into tm-qpr-dev am: d1ca02152f am: 9844283b8a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21108008 Change-Id: Ie6d84b3d1bd8dbf41005e1f90394e91bac17c5ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarView.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarView.kt index cc0ec54..b1e2812 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarView.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarView.kt
@@ -77,6 +77,17 @@ 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. *
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarViewTest.kt index 3fe6983..e4c8fd0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarViewTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/shared/ui/view/ModernStatusBarViewTest.kt
@@ -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 @@ 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()