From 209156b953e5e3533b7902b0afb7f8b8da8ec03e Mon Sep 17 00:00:00 2001
From: Caitlin Shkuratov <caitlinshk@google.com>
Date: Thu, 22 Dec 2022 20:52:28 +0000
Subject: [PATCH] [Media TTT] Tweak the coloring and sizing of the receiver
 icon.

Fixes: 263478641
Test: manual -- see screenshots in bug
Change-Id: I135fae722cb981888a8aa61cec07a6cb4caedaae
---
 .../res/drawable/media_ttt_chip_background_receiver.xml  | 6 +++---
 packages/SystemUI/res/values/dimens.xml                  | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/SystemUI/res/drawable/media_ttt_chip_background_receiver.xml b/packages/SystemUI/res/drawable/media_ttt_chip_background_receiver.xml
index 708bc1ac7e8a7..8aae276789d68 100644
--- a/packages/SystemUI/res/drawable/media_ttt_chip_background_receiver.xml
+++ b/packages/SystemUI/res/drawable/media_ttt_chip_background_receiver.xml
@@ -19,8 +19,8 @@
     xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
     android:shape="oval">
     <size
-        android:height="@dimen/media_ttt_chip_size_receiver"
-        android:width="@dimen/media_ttt_chip_size_receiver"
+        android:height="@dimen/media_ttt_icon_size_receiver"
+        android:width="@dimen/media_ttt_icon_size_receiver"
         />
-    <solid android:color="?androidprv:attr/colorSurface" />
+    <solid android:color="?androidprv:attr/colorAccentPrimary" />
 </shape>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 584823746662c..ecb6560914785 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -1073,11 +1073,12 @@
     <dimen name="media_ttt_last_item_start_margin">12dp</dimen>
 
     <!-- Media tap-to-transfer chip for receiver device -->
-    <dimen name="media_ttt_chip_size_receiver">100dp</dimen>
-    <dimen name="media_ttt_icon_size_receiver">95dp</dimen>
+    <dimen name="media_ttt_icon_size_receiver">112dp</dimen>
     <!-- Add some padding for the generic icon so it doesn't go all the way to the border. -->
-    <dimen name="media_ttt_generic_icon_padding">12dp</dimen>
-    <dimen name="media_ttt_receiver_vert_translation">20dp</dimen>
+    <!-- The generic icon should be 40dp, and the full icon is 112dp, so the padding should be
+         (112 - 40) / 2 = 36dp -->
+    <dimen name="media_ttt_generic_icon_padding">36dp</dimen>
+    <dimen name="media_ttt_receiver_vert_translation">40dp</dimen>
 
     <!-- Window magnification -->
     <dimen name="magnification_border_drag_size">35dp</dimen>