Fix battery usage screen issues

Tint icons properly
Bug: 21077770

Show better icons for wifi and bt (remove the old ones)
Bug: 21172936

Also add a way to show fake items in power list for testing.

Change-Id: I6b6804673a68190ebc3f2ea32802e30811a7f5b2

14 files changed, 1 insertions, 43 deletions

diff --git a/res/drawable-hdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-hdpi/ic_settings_bluetooth2_alpha.png
deleted file mode 100644
index 9dbc509..0000000
--- a/res/drawable-hdpi/ic_settings_bluetooth2_alpha.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_settings_bluetooth_alpha.png b/res/drawable-hdpi/ic_settings_bluetooth_alpha.png
index a21982e..9dbc509 100644
--- a/res/drawable-hdpi/ic_settings_bluetooth_alpha.png
+++ b/res/drawable-hdpi/ic_settings_bluetooth_alpha.png
diff --git a/res/drawable-hdpi/ic_settings_wifi_alpha.png b/res/drawable-hdpi/ic_settings_wifi_alpha.png
deleted file mode 100644
index a21982e..0000000
--- a/res/drawable-hdpi/ic_settings_wifi_alpha.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-mdpi/ic_settings_bluetooth2_alpha.png
deleted file mode 100644
index f51e5ca..0000000
--- a/res/drawable-mdpi/ic_settings_bluetooth2_alpha.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_settings_bluetooth_alpha.png b/res/drawable-mdpi/ic_settings_bluetooth_alpha.png
index 31be004..f51e5ca 100644
--- a/res/drawable-mdpi/ic_settings_bluetooth_alpha.png
+++ b/res/drawable-mdpi/ic_settings_bluetooth_alpha.png
diff --git a/res/drawable-mdpi/ic_settings_wifi_alpha.png b/res/drawable-mdpi/ic_settings_wifi_alpha.png
deleted file mode 100644
index 31be004..0000000
--- a/res/drawable-mdpi/ic_settings_wifi_alpha.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-xhdpi/ic_settings_bluetooth2_alpha.png
deleted file mode 100644
index a3e09db..0000000
--- a/res/drawable-xhdpi/ic_settings_bluetooth2_alpha.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_settings_bluetooth_alpha.png b/res/drawable-xhdpi/ic_settings_bluetooth_alpha.png
index cee4e67..a3e09db 100644
--- a/res/drawable-xhdpi/ic_settings_bluetooth_alpha.png
+++ b/res/drawable-xhdpi/ic_settings_bluetooth_alpha.png
diff --git a/res/drawable-xhdpi/ic_settings_wifi_alpha.png b/res/drawable-xhdpi/ic_settings_wifi_alpha.png
deleted file mode 100644
index cee4e67..0000000
--- a/res/drawable-xhdpi/ic_settings_wifi_alpha.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-xxhdpi/ic_settings_bluetooth_alpha.png
index 2cc0577..2cc0577 100644
--- a/res/drawable-xxhdpi/ic_settings_bluetooth2_alpha.png
+++ b/res/drawable-xxhdpi/ic_settings_bluetooth_alpha.png
diff --git a/res/drawable-xxxhdpi/ic_settings_bluetooth2_alpha.png b/res/drawable-xxxhdpi/ic_settings_bluetooth_alpha.png
index 284c94e..284c94e 100644
--- a/res/drawable-xxxhdpi/ic_settings_bluetooth2_alpha.png
+++ b/res/drawable-xxxhdpi/ic_settings_bluetooth_alpha.png
diff --git a/res/drawable/ic_settings_bluetooth2.xml b/res/drawable/ic_settings_bluetooth2.xml
deleted file mode 100644
index df0f866..0000000
--- a/res/drawable/ic_settings_bluetooth2.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_settings_bluetooth2_alpha"
-    android:tint="?android:attr/colorAccent" />
-
diff --git a/res/drawable/ic_settings_wifi.xml b/res/drawable/ic_settings_wifi.xml
deleted file mode 100644
index 9b58909..0000000
--- a/res/drawable/ic_settings_wifi.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_settings_wifi_alpha"
-    android:tint="?android:attr/colorAccent" />
-
diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index 5b8c243..ebddd78 100644
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -36,7 +36,7 @@
                 android:id="@+id/bluetooth_settings"
                 android:title="@string/bluetooth_settings_title"
                 android:fragment="com.android.settings.bluetooth.BluetoothSettings"
-                android:icon="@drawable/ic_settings_bluetooth2"
+                android:icon="@drawable/ic_settings_bluetooth"
                 />
 
         <!-- SIM Cards -->