From f95ef293ddeb1c169842301b481ad84eac2641ec Mon Sep 17 00:00:00 2001
From: Anthony Tripaldi <atripaldi@google.com>
Date: Mon, 22 Apr 2019 16:47:45 -0400
Subject: Update caption toggle icon with GM2 icons used elsewhere in the
 system.

Bug: 130755731
Test: manual
Change-Id: I668b303f2e25af5f899f9cf588ddda0596458e97
---
 .../res/drawable/ic_volume_odi_captions.xml        | 23 +++---------------
 .../drawable/ic_volume_odi_captions_disabled.xml   | 28 ++++++++++------------
 2 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/packages/SystemUI/res/drawable/ic_volume_odi_captions.xml b/packages/SystemUI/res/drawable/ic_volume_odi_captions.xml
index 675aee9cd1dd..719b70219c4a 100644
--- a/packages/SystemUI/res/drawable/ic_volume_odi_captions.xml
+++ b/packages/SystemUI/res/drawable/ic_volume_odi_captions.xml
@@ -18,24 +18,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M16,12h2v2h-2z"
-      android:fillColor="#1A73E8"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M6,12h8v2h-8z"
-      android:fillColor="#1A73E8"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M20,2C21.1046,2 22,2.8954 22,4L22,16C22,17.1046 21.1046,18 20,18L6,18L2,22L2,4C2,2.8954 2.8954,2 4,2L20,2ZM20,16L20,4L4,4L4,16L20,16Z"
-      android:fillColor="#1A73E8"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M6,8h2v2h-2z"
-      android:fillColor="#1A73E8"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M10,8h8v2h-8z"
-      android:fillColor="#1A73E8"
-      android:fillType="nonZero"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,6h16v12zM6,10h2v2L6,12zM6,14h8v2L6,16zM16,14h2v2h-2zM10,10h8v2h-8z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_volume_odi_captions_disabled.xml b/packages/SystemUI/res/drawable/ic_volume_odi_captions_disabled.xml
index e818455950de..953d4fef6e58 100644
--- a/packages/SystemUI/res/drawable/ic_volume_odi_captions_disabled.xml
+++ b/packages/SystemUI/res/drawable/ic_volume_odi_captions_disabled.xml
@@ -18,20 +18,16 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M2.07,0.64L22,20.59L20.6,22L16.6,18L6,18L2,22L2,4C2.0006,3.8236 2.0276,3.6484 2.08,3.48L0.66,2.05L2.07,0.64ZM5.17,16L14.6,16L12.6,14L6,14L6,12L10.6,12L8,9.4L8,10L6,10L6,8L6.6,8L4,5.4L4,16L5.17,16Z"
-      android:fillColor="#1A73E8"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M18,12l-1.74,0l1.74,1.74z"
-      android:fillColor="#1A73E8"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M18,8l-5.74,0l2,2l3.74,0z"
-      android:fillColor="#1A73E8"
-      android:fillType="nonZero"/>
-  <path
-      android:pathData="M20,4L20,15.74L21.53,17.27C21.8296,16.9142 21.9958,16.4651 22,16L22,4C22,2.8954 21.1046,2 20,2L6.26,2L8.26,4L20,4Z"
-      android:fillColor="#1A73E8"
-      android:fillType="nonZero"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,10l-5.18,0l2,2l3.18,0z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,14l-1.19,0l1.19,1.19z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2,2L0.58,3.41l1.66,1.66C2.09,5.35 2,5.66 2,6v12c0,1.1 0.9,2 2,2h13.17l2.61,2.61l1.41,-1.41L2,2zM4,18V6.83L7.17,10H6v2h2v-1.17L11.17,14H6v2h7.17l2,2H4z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,4H6.82l2,2H20v11.19l1.75,1.75C21.91,18.66 22,18.34 22,18V6C22,4.9 21.1,4 20,4z"/>
 </vector>
-- 
cgit v1.2.3-59-g8ed1b