Remove useless png and add vector drawable

Bug: 139336138
Test: visual
Change-Id: I5ccf4855b63f47b138a1662317d0c4ba8ce8984c

diff --git a/res/drawable-hdpi/ic_network_signal_0.png b/res/drawable-hdpi/ic_network_signal_0.png
deleted file mode 100644 (file)
index 1629ae6..0000000
Binary files a/res/drawable-hdpi/ic_network_signal_0.png and /dev/null differ

diff --git a/res/drawable-hdpi/ic_network_signal_1.png b/res/drawable-hdpi/ic_network_signal_1.png
deleted file mode 100644 (file)
index 162ade2..0000000
Binary files a/res/drawable-hdpi/ic_network_signal_1.png and /dev/null differ

diff --git a/res/drawable-hdpi/ic_network_signal_2.png b/res/drawable-hdpi/ic_network_signal_2.png
deleted file mode 100644 (file)
index d91273c..0000000
Binary files a/res/drawable-hdpi/ic_network_signal_2.png and /dev/null differ

diff --git a/res/drawable-hdpi/ic_network_signal_3.png b/res/drawable-hdpi/ic_network_signal_3.png
deleted file mode 100644 (file)
index 5634bc9..0000000
Binary files a/res/drawable-hdpi/ic_network_signal_3.png and /dev/null differ

diff --git a/res/drawable-hdpi/ic_network_signal_4.png b/res/drawable-hdpi/ic_network_signal_4.png
deleted file mode 100644 (file)
index 0588950..0000000
Binary files a/res/drawable-hdpi/ic_network_signal_4.png and /dev/null differ

diff --git a/res/drawable-hdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-hdpi/ic_sim_card_alert_white_48dp.png
deleted file mode 100644 (file)
index c8fbf42..0000000
Binary files a/res/drawable-hdpi/ic_sim_card_alert_white_48dp.png and /dev/null differ

diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_0.png b/res/drawable-ldrtl-hdpi/ic_network_signal_0.png
deleted file mode 100644 (file)
index 54e7af9..0000000
Binary files a/res/drawable-ldrtl-hdpi/ic_network_signal_0.png and /dev/null differ

diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_1.png b/res/drawable-ldrtl-hdpi/ic_network_signal_1.png
deleted file mode 100644 (file)
index de959d5..0000000
Binary files a/res/drawable-ldrtl-hdpi/ic_network_signal_1.png and /dev/null differ

diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_2.png b/res/drawable-ldrtl-hdpi/ic_network_signal_2.png
deleted file mode 100644 (file)
index 097b9fb..0000000
Binary files a/res/drawable-ldrtl-hdpi/ic_network_signal_2.png and /dev/null differ

diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_3.png b/res/drawable-ldrtl-hdpi/ic_network_signal_3.png
deleted file mode 100644 (file)
index 11cb40b..0000000
Binary files a/res/drawable-ldrtl-hdpi/ic_network_signal_3.png and /dev/null differ

diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_4.png b/res/drawable-ldrtl-hdpi/ic_network_signal_4.png
deleted file mode 100644 (file)
index d741ffc..0000000
Binary files a/res/drawable-ldrtl-hdpi/ic_network_signal_4.png and /dev/null differ

diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_0.png b/res/drawable-ldrtl-mdpi/ic_network_signal_0.png
deleted file mode 100644 (file)
index 4cac9ed..0000000
Binary files a/res/drawable-ldrtl-mdpi/ic_network_signal_0.png and /dev/null differ

diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_1.png b/res/drawable-ldrtl-mdpi/ic_network_signal_1.png
deleted file mode 100644 (file)
index 9323a13..0000000
Binary files a/res/drawable-ldrtl-mdpi/ic_network_signal_1.png and /dev/null differ

diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_2.png b/res/drawable-ldrtl-mdpi/ic_network_signal_2.png
deleted file mode 100644 (file)
index e2f38a9..0000000
Binary files a/res/drawable-ldrtl-mdpi/ic_network_signal_2.png and /dev/null differ

diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_3.png b/res/drawable-ldrtl-mdpi/ic_network_signal_3.png
deleted file mode 100644 (file)
index b565289..0000000
Binary files a/res/drawable-ldrtl-mdpi/ic_network_signal_3.png and /dev/null differ

diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_4.png b/res/drawable-ldrtl-mdpi/ic_network_signal_4.png
deleted file mode 100644 (file)
index f63a426..0000000
Binary files a/res/drawable-ldrtl-mdpi/ic_network_signal_4.png and /dev/null differ

diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_0.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_0.png
deleted file mode 100644 (file)
index e4ec015..0000000
Binary files a/res/drawable-ldrtl-xhdpi/ic_network_signal_0.png and /dev/null differ

diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_1.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_1.png
deleted file mode 100644 (file)
index 712685a..0000000
Binary files a/res/drawable-ldrtl-xhdpi/ic_network_signal_1.png and /dev/null differ

diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_2.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_2.png
deleted file mode 100644 (file)
index 99fe1ac..0000000
Binary files a/res/drawable-ldrtl-xhdpi/ic_network_signal_2.png and /dev/null differ

diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_3.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_3.png
deleted file mode 100644 (file)
index 4ac2f10..0000000
Binary files a/res/drawable-ldrtl-xhdpi/ic_network_signal_3.png and /dev/null differ

diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_4.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_4.png
deleted file mode 100644 (file)
index 34608f1..0000000
Binary files a/res/drawable-ldrtl-xhdpi/ic_network_signal_4.png and /dev/null differ

diff --git a/res/drawable-mdpi/ic_network_signal_0.png b/res/drawable-mdpi/ic_network_signal_0.png
deleted file mode 100644 (file)
index a1b8431..0000000
Binary files a/res/drawable-mdpi/ic_network_signal_0.png and /dev/null differ

diff --git a/res/drawable-mdpi/ic_network_signal_1.png b/res/drawable-mdpi/ic_network_signal_1.png
deleted file mode 100644 (file)
index cc6179d..0000000
Binary files a/res/drawable-mdpi/ic_network_signal_1.png and /dev/null differ

diff --git a/res/drawable-mdpi/ic_network_signal_2.png b/res/drawable-mdpi/ic_network_signal_2.png
deleted file mode 100644 (file)
index 1373fb6..0000000
Binary files a/res/drawable-mdpi/ic_network_signal_2.png and /dev/null differ

diff --git a/res/drawable-mdpi/ic_network_signal_3.png b/res/drawable-mdpi/ic_network_signal_3.png
deleted file mode 100644 (file)
index 14468eb..0000000
Binary files a/res/drawable-mdpi/ic_network_signal_3.png and /dev/null differ

diff --git a/res/drawable-mdpi/ic_network_signal_4.png b/res/drawable-mdpi/ic_network_signal_4.png
deleted file mode 100644 (file)
index 43cdf26..0000000
Binary files a/res/drawable-mdpi/ic_network_signal_4.png and /dev/null differ

diff --git a/res/drawable-mdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-mdpi/ic_sim_card_alert_white_48dp.png
deleted file mode 100644 (file)
index 18cd7f9..0000000
Binary files a/res/drawable-mdpi/ic_sim_card_alert_white_48dp.png and /dev/null differ

diff --git a/res/drawable-xhdpi/ic_network_signal_0.png b/res/drawable-xhdpi/ic_network_signal_0.png
deleted file mode 100644 (file)
index b609ecf..0000000
Binary files a/res/drawable-xhdpi/ic_network_signal_0.png and /dev/null differ

diff --git a/res/drawable-xhdpi/ic_network_signal_1.png b/res/drawable-xhdpi/ic_network_signal_1.png
deleted file mode 100644 (file)
index 854921f..0000000
Binary files a/res/drawable-xhdpi/ic_network_signal_1.png and /dev/null differ

diff --git a/res/drawable-xhdpi/ic_network_signal_2.png b/res/drawable-xhdpi/ic_network_signal_2.png
deleted file mode 100644 (file)
index 3db4ce6..0000000
Binary files a/res/drawable-xhdpi/ic_network_signal_2.png and /dev/null differ

diff --git a/res/drawable-xhdpi/ic_network_signal_3.png b/res/drawable-xhdpi/ic_network_signal_3.png
deleted file mode 100644 (file)
index 18003e5..0000000
Binary files a/res/drawable-xhdpi/ic_network_signal_3.png and /dev/null differ

diff --git a/res/drawable-xhdpi/ic_network_signal_4.png b/res/drawable-xhdpi/ic_network_signal_4.png
deleted file mode 100644 (file)
index 304108f..0000000
Binary files a/res/drawable-xhdpi/ic_network_signal_4.png and /dev/null differ

diff --git a/res/drawable-xhdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-xhdpi/ic_sim_card_alert_white_48dp.png
deleted file mode 100644 (file)
index 6d983b7..0000000
Binary files a/res/drawable-xhdpi/ic_sim_card_alert_white_48dp.png and /dev/null differ

diff --git a/res/drawable-xxhdpi/ic_network_signal_4.png b/res/drawable-xxhdpi/ic_network_signal_4.png
deleted file mode 100644 (file)
index dafe7c4..0000000
Binary files a/res/drawable-xxhdpi/ic_network_signal_4.png and /dev/null differ

diff --git a/res/drawable-xxhdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-xxhdpi/ic_sim_card_alert_white_48dp.png
deleted file mode 100644 (file)
index 6c8dd1f..0000000
Binary files a/res/drawable-xxhdpi/ic_sim_card_alert_white_48dp.png and /dev/null differ

diff --git a/res/drawable-xxxhdpi/ic_network_signal_4.png b/res/drawable-xxxhdpi/ic_network_signal_4.png
deleted file mode 100644 (file)
index 622cc4c..0000000
Binary files a/res/drawable-xxxhdpi/ic_network_signal_4.png and /dev/null differ

diff --git a/res/drawable-xxxhdpi/ic_sim_card_alert_white_48dp.png b/res/drawable-xxxhdpi/ic_sim_card_alert_white_48dp.png
deleted file mode 100644 (file)
index e8b6667..0000000
Binary files a/res/drawable-xxxhdpi/ic_sim_card_alert_white_48dp.png and /dev/null differ

diff --git a/res/drawable/ic_sim_alert.xml b/res/drawable/ic_sim_alert.xml
new file mode 100644 (file)
index 0000000..ed9aa43
--- /dev/null
+++ b/res/drawable/ic_sim_alert.xml
@@ -0,0 +1,27 @@
+<!--
+  Copyright (C) 2019 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:pathData="m4.8578,21.8264c-0.2247,-0.137 -0.5206,-0.4329 -0.6575,-0.6575 -0.2399,-0.3935 -0.2491,-0.6433 -0.2495,-6.7995l-0.0005,-6.391 2.9757,-2.9776 2.9757,-2.9776 4.3876,0.0005c4.1571,0.0004 4.4091,0.0135 4.7961,0.2495 0.2247,0.137 0.5206,0.4329 0.6575,0.6575 0.2422,0.3972 0.2491,0.6479 0.2491,9.1192 0,8.4712 -0.007,8.7219 -0.2491,9.1191 -0.137,0.2247 -0.4329,0.5206 -0.6575,0.6575 -0.3942,0.2403 -0.6436,0.2491 -7.1138,0.2491 -6.4703,0 -6.7197,-0.009 -7.1138,-0.2491zM12.9743,16.0604v-1.0027h-1.0027,-1.0027v1.0027,1.0027h1.0027,1.0027zM12.9743,10.5457L12.9743,8.039h-1.0027,-1.0027v2.5067,2.5067h1.0027,1.0027z"
+        android:strokeWidth="0.12533334"
+        android:fillColor="#ffffff"/>
+</vector>
+

diff --git a/res/drawable/signal.xml b/res/drawable/signal.xml
deleted file mode 100644 (file)
index f315600..0000000
--- a/res/drawable/signal.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<level-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:maxLevel="0" android:drawable="@drawable/ic_network_signal_0" />
-    <item android:maxLevel="1" android:drawable="@drawable/ic_network_signal_1" />
-    <item android:maxLevel="2" android:drawable="@drawable/ic_network_signal_2" />
-    <item android:maxLevel="3" android:drawable="@drawable/ic_network_signal_3" />
-    <item android:maxLevel="4" android:drawable="@drawable/ic_network_signal_4" />
-</level-list>
-

diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java
index fb83a4d..7153d15 100644 (file)
--- a/src/com/android/settings/sim/SimSelectNotification.java
+++ b/src/com/android/settings/sim/SimSelectNotification.java
@@ -202,7 +202,7 @@ public class SimSelectNotification extends BroadcastReceiver {
 
         Notification.Builder builder =
                 new Notification.Builder(context, SIM_SELECT_NOTIFICATION_CHANNEL)
-                .setSmallIcon(R.drawable.ic_sim_card_alert_white_48dp)
+                .setSmallIcon(R.drawable.ic_sim_alert)
                 .setColor(context.getColor(R.color.sim_noitification))
                 .setContentTitle(resources.getText(R.string.sim_notification_title))
                 .setContentText(resources.getText(R.string.sim_notification_summary))
@@ -282,7 +282,7 @@ public class SimSelectNotification extends BroadcastReceiver {
 
         Notification.Builder builder =
                 new Notification.Builder(context, SIM_WARNING_NOTIFICATION_CHANNEL)
-                        .setSmallIcon(R.drawable.ic_sim_card_alert_white_48dp)
+                        .setSmallIcon(R.drawable.ic_sim_alert)
                         .setColor(context.getColor(R.color.sim_noitification))
                         .setContentTitle(resources.getText(
                                 R.string.sim_combination_warning_notification_title))