From f9c6d8d69bfe8ffb52a14cbabb8ec1d711f2c2dc Mon Sep 17 00:00:00 2001
From: jackqdyulei <jackqdyulei@google.com>
Date: Wed, 30 Nov 2016 13:38:31 -0800
Subject: [PATCH] Remove qs_detail_empty and use colorForeground instead.

Bug: 33356706
Test: Manual
Change-Id: I3cdecf59488b61de989315041ac374d5ec963233
---
 packages/SystemUI/res/color/qs_detail_empty.xml             | 4 ----
 .../SystemUI/res/drawable/ic_qs_bluetooth_detail_empty.xml  | 5 +++--
 packages/SystemUI/res/drawable/ic_qs_cast_detail_empty.xml  | 6 ++++--
 packages/SystemUI/res/drawable/ic_qs_wifi_detail_empty.xml  | 5 +++--
 4 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 packages/SystemUI/res/color/qs_detail_empty.xml

diff --git a/packages/SystemUI/res/color/qs_detail_empty.xml b/packages/SystemUI/res/color/qs_detail_empty.xml
deleted file mode 100644
index 4be39c7ca6e03..0000000000000
--- a/packages/SystemUI/res/color/qs_detail_empty.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.14" android:color="@*android:color/quaternary_device_default_settings" />
-</selector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_qs_bluetooth_detail_empty.xml b/packages/SystemUI/res/drawable/ic_qs_bluetooth_detail_empty.xml
index 435bb9b81116e..33a4047c6f9c8 100644
--- a/packages/SystemUI/res/drawable/ic_qs_bluetooth_detail_empty.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_bluetooth_detail_empty.xml
@@ -18,9 +18,10 @@ Copyright (C) 2014 The Android Open Source Project
         android:height="56dp"
         android:viewportWidth="48.0"
         android:viewportHeight="48.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:alpha="0.14"
+        android:tint="?android:attr/colorForeground">
 
     <path
-        android:fillColor="@color/qs_detail_empty"
+        android:fillColor="#FFFFFF"
         android:pathData="M35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_cast_detail_empty.xml b/packages/SystemUI/res/drawable/ic_qs_cast_detail_empty.xml
index 59dcea2337cb7..fc831f446605f 100644
--- a/packages/SystemUI/res/drawable/ic_qs_cast_detail_empty.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_cast_detail_empty.xml
@@ -17,9 +17,11 @@ Copyright (C) 2014 The Android Open Source Project
         android:width="56dp"
         android:height="56dp"
         android:viewportWidth="48.0"
-        android:viewportHeight="48.0">
+        android:viewportHeight="48.0"
+        android:alpha="0.14"
+        android:tint="?android:attr/colorForeground">
 
     <path
-        android:fillColor="@color/qs_detail_empty"
+        android:fillColor="#FFFFFF"
         android:pathData="M42.0,6.0L6.0,6.0c-2.2,0.0 -4.0,1.8 -4.0,4.0l0.0,6.0l4.0,0.0l0.0,-6.0l36.0,0.0l0.0,28.0L28.0,38.0l0.0,4.0l14.0,0.0c2.2,0.0 4.0,-1.8 4.0,-4.0L46.0,10.0C46.0,7.8 44.2,6.0 42.0,6.0zM2.0,36.0l0.0,6.0l6.0,0.0C8.0,38.7 5.3,36.0 2.0,36.0zM2.0,28.0l0.0,4.0c5.5,0.0 10.0,4.5 10.0,10.0l4.0,0.0C16.0,34.3 9.7,28.0 2.0,28.0zM2.0,20.0l0.0,4.0c9.9,0.0 18.0,8.1 18.0,18.0l4.0,0.0C24.0,29.8 14.1,20.0 2.0,20.0z"/>
 </vector>
diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_detail_empty.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_detail_empty.xml
index a7889ab7786a4..7993c801e9a29 100644
--- a/packages/SystemUI/res/drawable/ic_qs_wifi_detail_empty.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_wifi_detail_empty.xml
@@ -18,9 +18,10 @@ Copyright (C) 2014 The Android Open Source Project
         android:height="56dp"
         android:viewportWidth="48.0"
         android:viewportHeight="48.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:alpha="0.14"
+        android:tint="?android:attr/colorForeground">
 
     <path
         android:pathData="M24.0,4.0C15.0,4.0 6.7,7.0 0.0,12.0l24.0,32.0l24.0,-32.0C41.3,7.0 33.0,4.0 24.0,4.0z"
-        android:fillColor="@color/qs_detail_empty" />
+        android:fillColor="#FFFFFF" />
 </vector>