Make the icon color an attribute and use one icon size.
This is part of moving CarSettings to the device default theme. Splitting this out to reduce the review burden on future CLs. There are some cases that will be cleaned up in future CLs (e.g. car_primary_icon_size in layouts, brightness knob color).
Bug: 119031147
Test: build and deploy, RunCarSettingsRoboTests
Change-Id: I093557f7d7d012c720fbd1e406b808aa8dd32fd1
diff --git a/res/drawable/ic_account.xml b/res/drawable/ic_account.xml
index 447b8e9..f7a666d 100644
--- a/res/drawable/ic_account.xml
+++ b/res/drawable/ic_account.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M3,5v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2L5,3c-1.11,0 -2,0.9 -2,2zM15,9c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3 1.34,-3 3,-3 3,1.34 3,3zM6,17c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v1L6,18v-1z"/>
</vector>
diff --git a/res/drawable/ic_add.xml b/res/drawable/ic_add.xml
index ad84bb3..458f8bf 100644
--- a/res/drawable/ic_add.xml
+++ b/res/drawable/ic_add.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FF000000"
+ android:fillColor="?attr/iconColor"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
</vector>
diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml
index a1b891b..f23c621 100644
--- a/res/drawable/ic_arrow_back.xml
+++ b/res/drawable/ic_arrow_back.xml
@@ -20,12 +20,11 @@
~ the margin by add the extra space in the icon itself -->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/car_primary_icon_size"
- android:height="@dimen/car_primary_icon_size"
- android:tint="@color/car_accent"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FF000000"
+ android:fillColor="?attr/iconColor"
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
</vector>
diff --git a/res/drawable/ic_arrow_drop_down.xml b/res/drawable/ic_arrow_drop_down.xml
index 8064ba8..854660a 100644
--- a/res/drawable/ic_arrow_drop_down.xml
+++ b/res/drawable/ic_arrow_drop_down.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/car_primary_icon_size"
- android:height="@dimen/car_primary_icon_size"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/iconColor"
android:pathData="M7,10l5,5 5,-5z"/>
</vector>
diff --git a/res/drawable/ic_arrow_forward.xml b/res/drawable/ic_arrow_forward.xml
index 0333fab..2b6b63c 100644
--- a/res/drawable/ic_arrow_forward.xml
+++ b/res/drawable/ic_arrow_forward.xml
@@ -17,13 +17,12 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/primary_icon_size"
- android:height="@dimen/primary_icon_size"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24"
android:viewportWidth="24">
+ <path android:pathData="M0 0h24v24H0z"/>
<path
- android:pathData="M0 0h24v24H0z"/>
- <path
- android:fillColor="#FFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z"/>
</vector>
diff --git a/res/drawable/ic_arrow_forward_on_disc.xml b/res/drawable/ic_arrow_forward_on_disc.xml
index bfb70e8..e68e457 100644
--- a/res/drawable/ic_arrow_forward_on_disc.xml
+++ b/res/drawable/ic_arrow_forward_on_disc.xml
@@ -20,8 +20,8 @@
<shape android:shape="oval">
<solid android:color="@color/google_blue_600"/>
<size
- android:width="@dimen/primary_icon_size"
- android:height="@dimen/primary_icon_size"/>
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"/>
</shape>
</item>
<item android:drawable="@drawable/ic_arrow_forward"/>
diff --git a/res/drawable/ic_audio_navi.xml b/res/drawable/ic_audio_navi.xml
index a7757d0..afc8a61 100644
--- a/res/drawable/ic_audio_navi.xml
+++ b/res/drawable/ic_audio_navi.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FF000000"
+ android:fillColor="?attr/iconColor"
android:pathData="M18.92,5.01C18.72,4.42 18.16,4 17.5,4h-11c-0.66,0 -1.21,0.42 -1.42,1.01L3,11v8c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h12v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-8l-2.08,-5.99zM6.5,15c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,12 6.5,12s1.5,0.67 1.5,1.5S7.33,15 6.5,15zM17.5,15c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM5,10l1.5,-4.5h11L19,10L5,10z"/>
</vector>
diff --git a/res/drawable/ic_backspace.xml b/res/drawable/ic_backspace.xml
index 41c9570..d2ea585 100644
--- a/res/drawable/ic_backspace.xml
+++ b/res/drawable/ic_backspace.xml
@@ -17,11 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/primary_icon_size"
- android:height="@dimen/primary_icon_size"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FF000000"
+ android:fillColor="?attr/iconColor"
android:pathData="M22,3H7C6.31,3 5.77,3.35 5.41,3.88l-5.04,7.57c-0.22,0.34 -0.22,0.77 0,1.11l5.04,7.56C5.77,20.64 6.31,21 7,21h15c1.1,0 2,-0.9 2,-2V5C24,3.9 23.1,3 22,3zM18.3,16.3L18.3,16.3c-0.39,0.39 -1.02,0.39 -1.41,0L14,13.41l-2.89,2.89c-0.39,0.39 -1.02,0.39 -1.41,0h0c-0.39,-0.39 -0.39,-1.02 0,-1.41L12.59,12L9.7,9.11c-0.39,-0.39 -0.39,-1.02 0,-1.41l0,0c0.39,-0.39 1.02,-0.39 1.41,0L14,10.59l2.89,-2.89c0.39,-0.39 1.02,-0.39 1.41,0v0c0.39,0.39 0.39,1.02 0,1.41L15.41,12l2.89,2.89C18.68,15.27 18.68,15.91 18.3,16.3z"/>
</vector>
diff --git a/res/drawable/ic_brightness_knob.xml b/res/drawable/ic_brightness_knob.xml
index 17e4542..429c3b8 100644
--- a/res/drawable/ic_brightness_knob.xml
+++ b/res/drawable/ic_brightness_knob.xml
@@ -17,8 +17,8 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
diff --git a/res/drawable/ic_cellular_data.xml b/res/drawable/ic_cellular_data.xml
index fa7c213..9b0b27f 100644
--- a/res/drawable/ic_cellular_data.xml
+++ b/res/drawable/ic_cellular_data.xml
@@ -17,12 +17,12 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#ffffff"
+ android:fillColor="?attr/iconColor"
android:pathData="M12.0,12.0m-9.5,0.0a9.5,9.5 0.0,1.0 1.0,19.0 0.0a9.5,9.5 0.0,1.0 1.0,-19.0 0.0
M10.6,5.4c-0.2,-0.2 -0.5,-0.2 -0.6,0.0L7.6,9.1l2.0,0.0l0.0,3.8L11.0,12.900001L11.0,9.1l2.0,0.0L10.6,5.4z
M13.3,18.6c0.2,0.2 0.5,0.2 0.6,0.0l2.4,-3.7l-2.0,0.0l0.0,-3.8l-1.4,0.0l0.0,3.8l-2.0,0.0L13.3,18.6z"/>
diff --git a/res/drawable/ic_check.xml b/res/drawable/ic_check.xml
index 18cece7..9838470 100644
--- a/res/drawable/ic_check.xml
+++ b/res/drawable/ic_check.xml
@@ -17,13 +17,13 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/primary_icon_size"
- android:height="@dimen/primary_icon_size"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24"
android:viewportWidth="24">
<path
android:pathData="M0 0h24v24H0z"/>
<path
- android:fillColor="#FFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
</vector>
diff --git a/res/drawable/ic_check_box_checked.xml b/res/drawable/ic_check_box_checked.xml
index 8ecdd48..479163d 100644
--- a/res/drawable/ic_check_box_checked.xml
+++ b/res/drawable/ic_check_box_checked.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/car_primary_icon_size"
- android:height="@dimen/car_primary_icon_size"
- android:tint="@color/car_accent"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/iconColor"
android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
</vector>
diff --git a/res/drawable/ic_check_box_unchecked.xml b/res/drawable/ic_check_box_unchecked.xml
index 88d7d96..70dbcd1 100644
--- a/res/drawable/ic_check_box_unchecked.xml
+++ b/res/drawable/ic_check_box_unchecked.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/car_primary_icon_size"
- android:height="@dimen/car_primary_icon_size"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/iconColor"
android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
</vector>
diff --git a/res/drawable/ic_check_on_disc.xml b/res/drawable/ic_check_on_disc.xml
index 6b8309b..c21de40 100644
--- a/res/drawable/ic_check_on_disc.xml
+++ b/res/drawable/ic_check_on_disc.xml
@@ -20,8 +20,8 @@
<shape android:shape="oval">
<solid android:color="@color/google_blue_600"/>
<size
- android:width="@dimen/primary_icon_size"
- android:height="@dimen/primary_icon_size"/>
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"/>
</shape>
</item>
<item android:drawable="@drawable/ic_check"/>
diff --git a/res/drawable/ic_chevron_right.xml b/res/drawable/ic_chevron_right.xml
index 2bb5136..ea9a763 100644
--- a/res/drawable/ic_chevron_right.xml
+++ b/res/drawable/ic_chevron_right.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FF000000"
+ android:fillColor="?attr/iconColor"
android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
</vector>
diff --git a/res/drawable/ic_close.xml b/res/drawable/ic_close.xml
index 55bba0c..07c42ef 100644
--- a/res/drawable/ic_close.xml
+++ b/res/drawable/ic_close.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/car_primary_icon_size"
- android:height="@dimen/car_primary_icon_size"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/iconColor"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
</vector>
diff --git a/res/drawable/ic_done.xml b/res/drawable/ic_done.xml
index 99a2219..5bb74f6 100644
--- a/res/drawable/ic_done.xml
+++ b/res/drawable/ic_done.xml
@@ -17,11 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/primary_icon_size"
- android:height="@dimen/primary_icon_size"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FF000000"
+ android:fillColor="?attr/iconColor"
android:pathData="M9,16.2l-3.5,-3.5a0.984,0.984 0,0 0,-1.4 0,0.984 0.984,0 0,0 0,1.4l4.19,4.19c0.39,0.39 1.02,0.39 1.41,0L20.3,7.7a0.984,0.984 0,0 0,0 -1.4,0.984 0.984,0 0,0 -1.4,0L9,16.2z"/>
</vector>
diff --git a/res/drawable/ic_language.xml b/res/drawable/ic_language.xml
index 3fc1089..eddea9a 100644
--- a/res/drawable/ic_language.xml
+++ b/res/drawable/ic_language.xml
@@ -17,11 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/car_primary_icon_size"
- android:height="@dimen/car_primary_icon_size"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="48.0"
android:viewportWidth="48.0">
<path
- android:fillColor="@color/car_tint"
+ android:fillColor="?attr/iconColor"
android:pathData="M23.99,4C12.94,4 4,12.95 4,24s8.94,20 19.99,20C35.04,44 44,35.05 44,24S35.04,4 23.99,4zM37.84,16h-5.9c-0.65,-2.5 -1.56,-4.9 -2.76,-7.12 3.68,1.26 6.74,3.81 8.66,7.12zM24,8.07c1.67,2.4 2.97,5.07 3.82,7.93h-7.64c0.85,-2.86 2.15,-5.53 3.82,-7.93zM8.52,28C8.19,26.72 8,25.38 8,24s0.19,-2.72 0.52,-4h6.75c-0.16,1.31 -0.27,2.64 -0.27,4 0,1.36 0.11,2.69 0.28,4L8.52,28zM10.15,32h5.9c0.65,2.5 1.56,4.9 2.76,7.13 -3.68,-1.26 -6.74,-3.82 -8.66,-7.13zM16.05,16h-5.9c1.92,-3.31 4.98,-5.87 8.66,-7.13 -1.2,2.23 -2.11,4.63 -2.76,7.13zM24,39.93c-1.66,-2.4 -2.96,-5.07 -3.82,-7.93h7.64c-0.86,2.86 -2.16,5.53 -3.82,7.93zM28.68,28h-9.36c-0.19,-1.31 -0.32,-2.64 -0.32,-4 0,-1.36 0.13,-2.69 0.32,-4h9.36c0.19,1.31 0.32,2.64 0.32,4 0,1.36 -0.13,2.69 -0.32,4zM29.19,39.12c1.2,-2.23 2.11,-4.62 2.76,-7.12h5.9c-1.93,3.31 -4.99,5.86 -8.66,7.12zM32.72,28c0.16,-1.31 0.28,-2.64 0.28,-4 0,-1.36 -0.11,-2.69 -0.28,-4h6.75c0.33,1.28 0.53,2.62 0.53,4s-0.19,2.72 -0.53,4h-6.75z"/>
</vector>
diff --git a/res/drawable/ic_lock.xml b/res/drawable/ic_lock.xml
index 9bd901c..4caeaf1 100644
--- a/res/drawable/ic_lock.xml
+++ b/res/drawable/ic_lock.xml
@@ -17,11 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="48dp"
- android:height="48dp"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="48.0"
android:viewportWidth="48.0">
<path
- android:fillColor="@color/google_blue_600"
+ android:fillColor="?attr/iconColor"
android:pathData="M36,16h-2v-4c0,-5.52 -4.48,-10 -10,-10S14,6.48 14,12v4h-2c-2.21,0 -4,1.79 -4,4v20c0,2.21 1.79,4 4,4h24c2.21,0 4,-1.79 4,-4L40,20c0,-2.21 -1.79,-4 -4,-4zM24,34c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4 4,1.79 4,4 -1.79,4 -4,4zM30.2,16L17.8,16v-4c0,-3.42 2.78,-6.2 6.2,-6.2 3.42,0 6.2,2.78 6.2,6.2v4z"/>
</vector>
diff --git a/res/drawable/ic_restore.xml b/res/drawable/ic_restore.xml
index 36c2857..0c457f5 100644
--- a/res/drawable/ic_restore.xml
+++ b/res/drawable/ic_restore.xml
@@ -17,13 +17,12 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M13.5 7.75v4.5l3.37 2c.34 .2 .46 .65 .25 .99 s-.64 .45 -.98 .24 L12
13V7.75c0-.41 .34 -.75 .75 -.75s.75 .34 .75 .75 zM13.05 3C8.11 3 4.1 7.02 4.1
11.95c0 .02 .01 .03 .01 .05H2.05c-.47 0-.71 .57 -.37 .9 l2.95 2.94c.21 .21 .54
diff --git a/res/drawable/ic_settings_about.xml b/res/drawable/ic_settings_about.xml
index 1a3671c..75647d0 100644
--- a/res/drawable/ic_settings_about.xml
+++ b/res/drawable/ic_settings_about.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M11.0,17.0l2.0,0.0l0.0,-6.0l-2.0,0.0l0.0,6.0zm1.0,-15.0C6.48,2.0 2.0,6.48 2.0,12.0s4.48,10.0 10.0,10.0 10.0,-4.48 10.0,-10.0S17.52,2.0 12.0,2.0zm0.0,18.0c-4.41,0.0 -8.0,-3.59 -8.0,-8.0s3.59,-8.0 8.0,-8.0 8.0,3.59 8.0,8.0 -3.59,8.0 -8.0,8.0zM11.0,9.0l2.0,0.0L13.0,7.0l-2.0,0.0l0.0,2.0z"/>
</vector>
diff --git a/res/drawable/ic_settings_applications.xml b/res/drawable/ic_settings_applications.xml
index 66e73d2..b970c3d 100644
--- a/res/drawable/ic_settings_applications.xml
+++ b/res/drawable/ic_settings_applications.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M5.0,16.0c0.0,3.87 3.13,7.0 7.0,7.0s7.0,-3.13 7.0,-7.0l0.0,-4.0L5.0,12.0l0.0,4.0zM16.12,4.37l2.1,-2.1 -0.82,-0.83 -2.3,2.31C14.16,3.28 13.12,3.0 12.0,3.0s-2.1,0.28 -3.0,0.75L6.6,1.44l-0.8,0.83 2.1,2.1C6.14,5.64 5.0,7.68 5.0,10.0l0.0,1.0l14.0,0.0l0.0,-1.0c0.0,-2.32 -1.14,-4.36 -2.88,-5.63zM9.0,9.0c-0.55,0.0 -1.0,-0.45 -1.0,-1.0s0.45,-1.0 1.0,-1.0 1.0,0.45 1.0,1.0 -0.45,1.0 -1.0,1.0zm6.0,0.0c-0.55,0.0 -1.0,-0.45 -1.0,-1.0s0.45,-1.0 1.0,-1.0 1.0,0.45 1.0,1.0 -0.45,1.0 -1.0,1.0z"/>
</vector>
diff --git a/res/drawable/ic_settings_bluetooth.xml b/res/drawable/ic_settings_bluetooth.xml
index ea50118..52127a8 100644
--- a/res/drawable/ic_settings_bluetooth.xml
+++ b/res/drawable/ic_settings_bluetooth.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="48.0"
android:viewportWidth="48.0">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M35.41,15.41L24.0,4.0l-2.0,0.0l0.0,15.17L12.83,10.0 10.0,12.83 21.17,24.0 10.0,35.17 12.83,38.0 22.0,28.83L22.0,44.0l2.0,0.0l11.41,-11.41L26.83,24.0l8.58,-8.59zM26.0,11.66l3.76,3.76L26.0,19.17l0.0,-7.51zm3.76,20.93L26.0,36.34l0.0,-7.52l3.76,3.77z"/>
</vector>
diff --git a/res/drawable/ic_settings_bluetooth_connected.xml b/res/drawable/ic_settings_bluetooth_connected.xml
index 0eaa466..537d239 100644
--- a/res/drawable/ic_settings_bluetooth_connected.xml
+++ b/res/drawable/ic_settings_bluetooth_connected.xml
@@ -17,11 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="20dp"
- android:height="20dp"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="20.0"
android:viewportWidth="20.0">
<path
- android:fillColor="#FFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M5.833,10L4.167,8.333L2.5,10l1.667,1.667L5.833,10zM14.758,6.425L10,1.667H9.167v6.325L5.342,4.167L4.167,5.342L8.825,10l-4.658,4.658l1.175,1.175l3.825,-3.825v6.325H10l4.758,-4.758L11.175,10C11.175,10 14.758,6.425 14.758,6.425zM10.833,4.858L12.4,6.425l-1.567,1.567V4.858zM12.4,13.575l-1.567,1.567v-3.133C10.833,12.008 12.4,13.575 12.4,13.575zM15.833,8.333L14.167,10l1.667,1.667L17.5,10L15.833,8.333z"/>
</vector>
diff --git a/res/drawable/ic_settings_bluetooth_disabled.xml b/res/drawable/ic_settings_bluetooth_disabled.xml
index 49b67a0..4e4d150 100644
--- a/res/drawable/ic_settings_bluetooth_disabled.xml
+++ b/res/drawable/ic_settings_bluetooth_disabled.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M13,5.83l1.88,1.88 -1.6,1.6 1.41,1.41 3.02,-3.02L12,2h-1v5.03l2,2v-3.2zM5.41,4L4,5.41 10.59,12 5,17.59 6.41,19 11,14.41V22h1l4.29,-4.29 2.3,2.29L20,18.59 5.41,4zM13,18.17v-3.76l1.88,1.88L13,18.17z"/>
</vector>
diff --git a/res/drawable/ic_settings_cellular.xml b/res/drawable/ic_settings_cellular.xml
index 0882f89..18b28ff 100644
--- a/res/drawable/ic_settings_cellular.xml
+++ b/res/drawable/ic_settings_cellular.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M2,22h20V2z"/>
</vector>
diff --git a/res/drawable/ic_settings_date_time.xml b/res/drawable/ic_settings_date_time.xml
index 266adba..1cef06a 100644
--- a/res/drawable/ic_settings_date_time.xml
+++ b/res/drawable/ic_settings_date_time.xml
@@ -17,15 +17,14 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M11.99,2.0C6.47,2.0 2.0,6.48 2.0,12.0s4.47,10.0 9.99,10.0C17.52,22.0 22.0,17.52 22.0,12.0S17.52,2.0 11.99,2.0zM12.0,20.0c-4.42,0.0 -8.0,-3.58 -8.0,-8.0s3.58,-8.0 8.0,-8.0 8.0,3.58 8.0,8.0 -3.58,8.0 -8.0,8.0z"/>
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M12.5,7.0L11.0,7.0l0.0,6.0l5.25,3.1 0.75,-1.23 -4.5,-2.67z"/>
</vector>
diff --git a/res/drawable/ic_settings_development.xml b/res/drawable/ic_settings_development.xml
index 5e0e64d..6bf4307 100644
--- a/res/drawable/ic_settings_development.xml
+++ b/res/drawable/ic_settings_development.xml
@@ -17,11 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/primary_icon_size"
- android:height="@dimen/primary_icon_size"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="256.0"
android:viewportWidth="256.0">
<path
- android:fillColor="@color/car_tint"
+ android:fillColor="?attr/iconColor"
android:pathData="m66.641,197.718c-7.73,-7.73 -7.974,-8.747 -7.974,-33.186 0,-26.1 -1.346,-29.646 -12,-31.605 -9.22,-1.696 -8.063,-11.352 1.884,-15.729l8.783,-3.864 1.333,-26.241c1.262,-24.834 1.744,-26.593 8.986,-32.813 9.335,-8.017 21.681,-7.817 21.681,0.351 0,3.149 -2.974,6.723 -7.333,8.812 -7.171,3.437 -7.333,4.03 -7.333,26.776 0,16.737 -1.164,24.923 -4.151,29.188 -3.757,5.364 -3.757,6.489 0,11.853 3.037,4.336 4.151,12.604 4.151,30.805v24.879l8.145,2.839c6.138,2.14 7.945,4.241 7.333,8.528 -1.331,9.333 -13.894,9.016 -23.504,-0.593zM167.111,203.556c-4.355,-4.355 -1.269,-11.211 6.222,-13.823l8,-2.789v-24.879c0,-18.201 1.114,-26.469 4.151,-30.805 3.757,-5.364 3.757,-6.489 0,-11.853 -2.987,-4.264 -4.151,-12.451 -4.151,-29.188 0,-22.746 -0.162,-23.339 -7.333,-26.776 -4.359,-2.089 -7.333,-5.663 -7.333,-8.812 0,-8.168 12.346,-8.369 21.681,-0.351 7.242,6.22 7.724,7.979 8.986,32.813l1.333,26.241 8.783,3.864c9.947,4.377 11.104,14.033 1.884,15.729 -10.654,1.959 -12,5.505 -12,31.605 0,24.31 -0.279,25.491 -7.795,33.007 -7.235,7.235 -18.253,10.191 -22.427,6.017z"/>
</vector>
diff --git a/res/drawable/ic_settings_display.xml b/res/drawable/ic_settings_display.xml
index 859f1d3..670b286 100644
--- a/res/drawable/ic_settings_display.xml
+++ b/res/drawable/ic_settings_display.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M20.0,15.31L23.31,12.0 20.0,8.69L20.0,4.0l-4.69,0.0L12.0,0.69 8.69,4.0L4.0,4.0l0.0,4.69L0.69,12.0 4.0,15.31L4.0,20.0l4.69,0.0L12.0,23.31 15.31,20.0L20.0,20.0l0.0,-4.69zM12.0,18.0L12.0,6.0c3.31,0.0 6.0,2.69 6.0,6.0s-2.69,6.0 -6.0,6.0z"/>
</vector>
diff --git a/res/drawable/ic_settings_gear.xml b/res/drawable/ic_settings_gear.xml
index 184764a..3ef1034 100644
--- a/res/drawable/ic_settings_gear.xml
+++ b/res/drawable/ic_settings_gear.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="48.0"
android:viewportWidth="48.0">
<path
- android:fillColor="#000000"
+ android:fillColor="?attr/iconColor"
android:pathData="M38.86,25.95c0.08,-0.64 0.14,-1.29 0.14,-1.95s-0.06,-1.31 -0.14,-1.95l4.23,-3.31c0.38,-0.3 0.49,-0.84 0.24,-1.28l-4,-6.93c-0.25,-0.43 -0.77,-0.61 -1.22,-0.43l-4.98,2.01c-1.03,-0.79 -2.16,-1.46 -3.38,-1.97L29,4.84c-0.09,-0.47 -0.5,-0.84 -1,-0.84h-8c-0.5,0 -0.91,0.37 -0.99,0.84l-0.75,5.3c-1.22,0.51 -2.35,1.17 -3.38,1.97L9.9,10.1c-0.45,-0.17 -0.97,0 -1.22,0.43l-4,6.93c-0.25,0.43 -0.14,0.97 0.24,1.28l4.22,3.31C9.06,22.69 9,23.34 9,24s0.06,1.31 0.14,1.95l-4.22,3.31c-0.38,0.3 -0.49,0.84 -0.24,1.28l4,6.93c0.25,0.43 0.77,0.61 1.22,0.43l4.98,-2.01c1.03,0.79 2.16,1.46 3.38,1.97l0.75,5.3c0.08,0.47 0.49,0.84 0.99,0.84h8c0.5,0 0.91,-0.37 0.99,-0.84l0.75,-5.3c1.22,-0.51 2.35,-1.17 3.38,-1.97l4.98,2.01c0.45,0.17 0.97,0 1.22,-0.43l4,-6.93c0.25,-0.43 0.14,-0.97 -0.24,-1.28l-4.22,-3.31zM24,31c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
</vector>
diff --git a/res/drawable/ic_settings_location.xml b/res/drawable/ic_settings_location.xml
index 5cf1bb7..83bbf87 100644
--- a/res/drawable/ic_settings_location.xml
+++ b/res/drawable/ic_settings_location.xml
@@ -17,11 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="@color/car_tint"
+ android:fillColor="?attr/iconColor"
android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
</vector>
diff --git a/res/drawable/ic_settings_night_display.xml b/res/drawable/ic_settings_night_display.xml
index bf42f13..b651096 100644
--- a/res/drawable/ic_settings_night_display.xml
+++ b/res/drawable/ic_settings_night_display.xml
@@ -17,8 +17,8 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="44.0"
android:viewportWidth="44.0">
<path
diff --git a/res/drawable/ic_settings_sound.xml b/res/drawable/ic_settings_sound.xml
index bc5bbcf..2b8becb 100644
--- a/res/drawable/ic_settings_sound.xml
+++ b/res/drawable/ic_settings_sound.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M3.0,9.0l0.0,6.0l4.0,0.0l5.0,5.0L12.0,4.0L7.0,9.0L3.0,9.0zm13.5,3.0c0.0,-1.77 -1.02,-3.29 -2.5,-4.03l0.0,8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14.0,3.23l0.0,2.06c2.8,0.86 5.0,3.54 5.0,6.71s-2.11,5.85 -5.0,6.71l0.0,2.06c4.01,-0.91 7.0,-4.49 7.0,-8.77s-2.99,-7.86 -7.0,-8.77z"/>
</vector>
diff --git a/res/drawable/ic_settings_wifi.xml b/res/drawable/ic_settings_wifi.xml
index 4adbb27..c6324c7 100644
--- a/res/drawable/ic_settings_wifi.xml
+++ b/res/drawable/ic_settings_wifi.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="18.0"
android:viewportWidth="18.0">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M9.01,15.99l8.8,-10.96C17.47,4.77 14.08,2.0 9.0,2.0S0.53,4.7 0.19,5.03l8.8,10.96l0.02,0.0z"/>
</vector>
diff --git a/res/drawable/ic_settings_wifi_disabled.xml b/res/drawable/ic_settings_wifi_disabled.xml
index 86bbe28..b4bd202 100644
--- a/res/drawable/ic_settings_wifi_disabled.xml
+++ b/res/drawable/ic_settings_wifi_disabled.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4 -1.5,0 -2.89,0.19 -4.15,0.48L18.18,13.8 23.64,7zM17.04,15.22L3.27,1.44 2,2.72l2.05,2.06C1.91,5.76 0.59,6.82 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01 3.9,-4.86 3.32,3.32 1.27,-1.27 -3.46,-3.46z"/>
</vector>
diff --git a/res/drawable/ic_system_update.xml b/res/drawable/ic_system_update.xml
index b0c14f2..69ccc06 100644
--- a/res/drawable/ic_system_update.xml
+++ b/res/drawable/ic_system_update.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z"/>
</vector>
diff --git a/res/drawable/ic_translate.xml b/res/drawable/ic_translate.xml
index e106fcd..6e22fc5 100644
--- a/res/drawable/ic_translate.xml
+++ b/res/drawable/ic_translate.xml
@@ -14,12 +14,13 @@
limitations under the License.
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/car_primary_icon_size"
- android:height="@dimen/car_primary_icon_size"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
<path
- android:fillColor="@color/car_tint"
+ android:fillColor="?attr/iconColor"
android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
</vector>
diff --git a/res/drawable/ic_user.xml b/res/drawable/ic_user.xml
index 9f0ff6c..3906c00 100644
--- a/res/drawable/ic_user.xml
+++ b/res/drawable/ic_user.xml
@@ -17,12 +17,11 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:tint="@color/car_tint"
+ android:width="@dimen/icon_size"
+ android:height="@dimen/icon_size"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
+ android:fillColor="?attr/iconColor"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
</vector>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 96929c7..571842e 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -55,4 +55,6 @@
<!-- Classname of a PreferenceController corresponding to the preference -->
<attr name="controller" format="string"/>
</declare-styleable>
+
+ <attr name="iconColor" format="color"/>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0dd1dda..964882f 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -16,12 +16,12 @@
-->
<resources>
+ <dimen name="icon_size">44dp</dimen>
<dimen name="seekbar_track_height">6dp</dimen>
<dimen name="seekbar_track_corner">3dp</dimen>
<dimen name="seekbar_padding_top">10dp</dimen>
<dimen name="switch_end_padding">5dp</dimen>
<dimen name="double_icon_size">112dp</dimen>
- <dimen name="primary_icon_size">44dp</dimen>
<dimen name="action_bar_end_widget_margin_end">46dp</dimen>
<dimen name="optical_center_offset">1dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e365c63..cdd3c20 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -34,6 +34,7 @@
<item name="preferenceTheme">@style/PreferenceThemeOverlayCar</item>
<item name="wifi_signal">@drawable/wifi_signal</item>
<item name="WifiSignalColor">?android:attr/colorAccent</item>
+ <item name="iconColor">@color/car_tint</item>
<item name="android:windowBackground">@color/car_card</item>
<item name="android:windowEnterAnimation">@anim/trans_fade_in</item>
<item name="android:windowExitAnimation">@anim/trans_fade_out</item>
diff --git a/src/com/android/car/settings/accounts/SyncPreference.java b/src/com/android/car/settings/accounts/SyncPreference.java
index 3a2efc6..9f34929 100644
--- a/src/com/android/car/settings/accounts/SyncPreference.java
+++ b/src/com/android/car/settings/accounts/SyncPreference.java
@@ -24,6 +24,7 @@
import androidx.preference.SwitchPreference;
import com.android.car.settings.R;
+import com.android.car.theme.Themes;
/**
* A preference that represents the state of a sync adapter.
@@ -68,15 +69,15 @@
switch (mSyncState) {
case ACTIVE:
setIcon(R.drawable.ic_sync_anim);
- getIcon().setTint(getContext().getColor(R.color.car_tint));
+ getIcon().setTint(Themes.getAttrColor(getContext(), R.attr.iconColor));
break;
case PENDING:
setIcon(R.drawable.ic_sync);
- getIcon().setTint(getContext().getColor(R.color.car_tint));
+ getIcon().setTint(Themes.getAttrColor(getContext(), R.attr.iconColor));
break;
case FAILED:
setIcon(R.drawable.ic_sync_problem);
- getIcon().setTint(getContext().getColor(R.color.car_tint));
+ getIcon().setTint(Themes.getAttrColor(getContext(), R.attr.iconColor));
break;
default:
setIcon(null);
diff --git a/src/com/android/car/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/car/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
index 412eb89..66c61b5 100644
--- a/src/com/android/car/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
+++ b/src/com/android/car/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
@@ -26,6 +26,7 @@
import com.android.car.settings.R;
import com.android.car.settings.common.FragmentController;
+import com.android.car.theme.Themes;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import java.util.StringJoiner;
@@ -74,7 +75,7 @@
}
preference.setTitle(cachedDevice.getName());
preference.setIcon(pair.first);
- // TODO: handle icon tint.
+ preference.getIcon().setTint(Themes.getAttrColor(getContext(), R.attr.iconColor));
preference.setSummary(summaryJoiner.toString());
}
diff --git a/src/com/android/car/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/car/settings/bluetooth/BluetoothDevicePreference.java
index 1c23512..438ff8c 100644
--- a/src/com/android/car/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/car/settings/bluetooth/BluetoothDevicePreference.java
@@ -24,7 +24,9 @@
import androidx.annotation.NonNull;
import androidx.preference.Preference;
+import com.android.car.settings.R;
import com.android.car.settings.common.ButtonPreference;
+import com.android.car.theme.Themes;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
/**
@@ -80,7 +82,7 @@
.getBtClassDrawableWithDescription(getContext(), mCachedDevice);
if (pair.first != null) {
setIcon(pair.first);
- // TODO: handle icon tint.
+ getIcon().setTint(Themes.getAttrColor(getContext(), R.attr.iconColor));
}
setEnabled(!mCachedDevice.isBusy());
diff --git a/src/com/android/car/settings/common/ExtraSettingsLoader.java b/src/com/android/car/settings/common/ExtraSettingsLoader.java
index c8b1cd9..a31be4a 100644
--- a/src/com/android/car/settings/common/ExtraSettingsLoader.java
+++ b/src/com/android/car/settings/common/ExtraSettingsLoader.java
@@ -34,6 +34,7 @@
import androidx.preference.Preference;
import com.android.car.settings.R;
+import com.android.car.theme.Themes;
import java.util.ArrayList;
import java.util.List;
@@ -139,7 +140,7 @@
preference.setSummary(summary);
if (icon != null) {
preference.setIcon(icon.loadDrawable(mContext));
- // TODO: handle icon tint
+ preference.getIcon().setTint(Themes.getAttrColor(mContext, R.attr.iconColor));
}
preference.setIntent(extraSettingIntent);
preferences.add(preference);
diff --git a/src/com/android/car/settings/sound/VolumeSettingsPreferenceController.java b/src/com/android/car/settings/sound/VolumeSettingsPreferenceController.java
index a5d4b47..a89e88b 100644
--- a/src/com/android/car/settings/sound/VolumeSettingsPreferenceController.java
+++ b/src/com/android/car/settings/sound/VolumeSettingsPreferenceController.java
@@ -40,6 +40,7 @@
import com.android.car.settings.common.Logger;
import com.android.car.settings.common.PreferenceController;
import com.android.car.settings.common.SeekBarPreference;
+import com.android.car.theme.Themes;
import java.util.ArrayList;
import java.util.List;
@@ -141,6 +142,7 @@
SeekBarPreference preference = new SeekBarPreference(getContext());
preference.setTitle(getContext().getString(titleId));
preference.setIcon(getContext().getDrawable(iconResId));
+ preference.getIcon().setTint(Themes.getAttrColor(getContext(), R.attr.iconColor));
try {
preference.setValue(mCarAudioManager.getGroupVolume(volumeGroupId));
preference.setMin(mCarAudioManager.getGroupMinVolume(volumeGroupId));
diff --git a/src/com/android/car/settings/users/UserIconProvider.java b/src/com/android/car/settings/users/UserIconProvider.java
index 7d76da7..f08ef66 100644
--- a/src/com/android/car/settings/users/UserIconProvider.java
+++ b/src/com/android/car/settings/users/UserIconProvider.java
@@ -44,7 +44,6 @@
* If icon has not been assigned to this user, it defaults to a generic user icon.
*
* @param userInfo User for which the icon is requested.
- *
* @return Drawable representing the icon for the user.
*/
public Drawable getUserIcon(UserInfo userInfo, Context context) {
@@ -55,7 +54,7 @@
}
Resources res = context.getResources();
BitmapDrawable scaledIcon = (BitmapDrawable) mCarUserManagerHelper.scaleUserIcon(icon, res
- .getDimensionPixelSize(R.dimen.car_primary_icon_size));
+ .getDimensionPixelSize(R.dimen.icon_size));
// Enforce that the icon is circular
RoundedBitmapDrawable circleIcon = RoundedBitmapDrawableFactory
@@ -78,12 +77,11 @@
* Scales passed in bitmap to the appropriate user icon size.
*
* @param bitmap Bitmap to scale.
- *
* @return Drawable scaled to the user icon size.
*/
public static Drawable scaleUserIcon(Bitmap bitmap, CarUserManagerHelper userManagerHelper,
Context context) {
return userManagerHelper.scaleUserIcon(bitmap, context.getResources()
- .getDimensionPixelSize(R.dimen.car_primary_icon_size));
+ .getDimensionPixelSize(R.dimen.icon_size));
}
}