From 492150d39ea50e9607ca9d2c2dad1341a31c39e5 Mon Sep 17 00:00:00 2001 From: Caitlin Shkuratov Date: Thu, 6 Oct 2022 21:14:20 +0000 Subject: [PATCH] [Media TTT] Receiver ripple tweaks: Use an ellipse and use no sparkle strength (so that it's a smooth ripple not a turbulent one). Bug: 203800342 Test: Trigger receiver chip and verify ripple Change-Id: Ic5ef8de206c834362746e502486d234c0cb34291 --- .../receiver/MediaTttChipControllerReceiver.kt | 9 ++++----- .../taptotransfer/receiver/ReceiverChipRippleView.kt | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt index 1faf72b837ba9..511c4bf6f949e 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt @@ -208,13 +208,12 @@ class MediaTttChipControllerReceiver @Inject constructor( private fun layoutRipple(rippleView: ReceiverChipRippleView) { val windowBounds = windowManager.currentWindowMetrics.bounds - val height = windowBounds.height() - val width = windowBounds.width() + val height = windowBounds.height().toFloat() + val width = windowBounds.width().toFloat() - val maxDiameter = height / 2.5f - rippleView.setMaxSize(maxDiameter, maxDiameter) + rippleView.setMaxSize(width / 2f, height / 2f) // Center the ripple on the bottom of the screen in the middle. - rippleView.setCenter(width * 0.5f, height.toFloat()) + rippleView.setCenter(width * 0.5f, height) val color = Utils.getColorAttrDefaultColor(context, R.attr.wallpaperTextColorAccent) rippleView.setColor(color, 70) } diff --git a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ReceiverChipRippleView.kt b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ReceiverChipRippleView.kt index 6a505f06a4959..e354a03f17250 100644 --- a/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ReceiverChipRippleView.kt +++ b/packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/ReceiverChipRippleView.kt @@ -18,6 +18,7 @@ package com.android.systemui.media.taptotransfer.receiver import android.content.Context import android.util.AttributeSet +import com.android.systemui.ripple.RippleShader import com.android.systemui.ripple.RippleView /** @@ -25,9 +26,9 @@ import com.android.systemui.ripple.RippleView */ class ReceiverChipRippleView(context: Context?, attrs: AttributeSet?) : RippleView(context, attrs) { init { - // TODO: use RippleShape#ELLIPSE when calling setupShader. - setupShader() + setupShader(RippleShader.RippleShape.ELLIPSE) setRippleFill(true) + setSparkleStrength(0f) duration = 3000L } }