SystemUI: Vector drawables for data activity resources

Also include a transparent 'no activity' version to avoid
relayout requests of the ImageView because of size changes.

Change-Id: I0aee41f145b946c79c6bbb2a21954259ebd5f873

packages/SystemUI/res/drawable/stat_sys_signal_in.xml

@@ -0,0 +1,24 @@
+<!--
+Copyright (C) 2014 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="8.5dp"
+        android:height="17dp"
+        android:viewportWidth="12.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#7F000000"
+        android:pathData="M9.000000,15.700000l-3.000000,5.599999 -3.000000,-5.599999z"/>
+</vector>

packages/SystemUI/res/drawable/stat_sys_signal_inout.xml

@@ -0,0 +1,27 @@
+<!--
+Copyright (C) 2014 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="8.5dp"
+        android:height="17dp"
+        android:viewportWidth="12.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#7F000000"
+        android:pathData="M9.000000,15.700000l-3.000000,5.599999 -3.000000,-5.599999z"/>
+    <path
+        android:fillColor="#7F000000"
+        android:pathData="M3.000000,13.700000l3.000000,-5.700000 3.000000,5.700000z"/>
+</vector>

packages/SystemUI/res/drawable/stat_sys_signal_none.xml

@@ -0,0 +1,22 @@
+<!--
+Copyright (C) 2014 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="8.5dp"
+        android:height="17dp"
+        android:viewportWidth="12.0"
+        android:viewportHeight="24.0">
+    <!-- no path, drawable is intended to be transparent -->
+</vector>

packages/SystemUI/res/drawable/stat_sys_signal_out.xml

@@ -0,0 +1,24 @@
+<!--
+Copyright (C) 2014 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="8.5dp"
+        android:height="17dp"
+        android:viewportWidth="12.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#7F000000"
+        android:pathData="M3.000000,13.700000l3.000000,-5.700000 3.000000,5.700000z"/>
+</vector>

packages/SystemUI/res/layout/msim_signal_cluster_view.xml

@@ -76,17 +76,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/data_combo"
-        android:visibility="gone"
+        android:visibility="visible"
         >
-        <View
-            android:layout_width="6dp"
-            android:layout_height="6dp"
-            android:visibility="invisible"
-            />
         <ImageView
             android:id="@+id/data_inout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
             />
     </FrameLayout>
     <FrameLayout
@@ -181,15 +177,11 @@
         android:id="@+id/data_combo_sub2"
         android:visibility="gone"
         >
-        <View
-            android:layout_width="6dp"
-            android:layout_height="6dp"
-            android:visibility="invisible"
-            />
         <ImageView
             android:id="@+id/data_inout_sub2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
             />
     </FrameLayout>
     <FrameLayout
@@ -260,15 +252,11 @@
         android:id="@+id/data_combo_sub3"
         android:visibility="gone"
         >
-        <View
-            android:layout_width="6dp"
-            android:layout_height="6dp"
-            android:visibility="invisible"
-            />
         <ImageView
             android:id="@+id/data_inout_sub3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
             />
     </FrameLayout>
     <FrameLayout

packages/SystemUI/res/layout/signal_cluster_view.xml

@@ -48,7 +48,7 @@
             android:id="@+id/wifi_inout"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:layout_gravity="center|bottom"
+            android:layout_gravity="center_horizontal|bottom"
             />
     </FrameLayout>
     <View
@@ -61,17 +61,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/data_combo"
-        android:visibility="gone"
+        android:visibility="visible"
         >
-        <View
-            android:layout_width="6dp"
-            android:layout_height="6dp"
-            android:visibility="invisible"
-            />
         <ImageView
             android:id="@+id/data_inout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
             />
     </FrameLayout>
     <FrameLayout

packages/SystemUI/res/values/arrays.xml

@@ -199,7 +199,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_g_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -214,7 +214,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_e_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -229,7 +229,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_2g_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -244,7 +244,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_3g_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -259,7 +259,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_4g_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -274,7 +274,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_h_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -289,7 +289,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_hp_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -304,7 +304,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_1x_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>
@@ -319,7 +319,7 @@
     </string-array>
 
     <string-array name="telephony_data_activity_lte_sim1">
-        <item>0</item>
+        <item>drawable/stat_sys_signal_none</item>
         <item>drawable/stat_sys_signal_in</item>
         <item>drawable/stat_sys_signal_out</item>
         <item>drawable/stat_sys_signal_inout</item>

packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkControllerImpl.java

@@ -1090,16 +1090,16 @@ protected void refreshViews(int phoneId) {
 
                 switch (mWifiActivity) {
                     case WifiManager.DATA_ACTIVITY_IN:
-                        mWifiActivityIconId = R.drawable.stat_sys_wifi_in;
+                        mWifiActivityIconId = R.drawable.stat_sys_signal_in;
                         break;
                     case WifiManager.DATA_ACTIVITY_OUT:
-                        mWifiActivityIconId = R.drawable.stat_sys_wifi_out;
+                        mWifiActivityIconId = R.drawable.stat_sys_signal_out;
                         break;
                     case WifiManager.DATA_ACTIVITY_INOUT:
-                        mWifiActivityIconId = R.drawable.stat_sys_wifi_inout;
+                        mWifiActivityIconId = R.drawable.stat_sys_signal_inout;
                         break;
                     case WifiManager.DATA_ACTIVITY_NONE:
-                        mWifiActivityIconId = 0;
+                        mWifiActivityIconId = R.drawable.stat_sys_signal_none;
                         break;
                 }
             }

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

@@ -1336,16 +1336,16 @@ void refreshViews() {
                 }
                 switch (mWifiActivity) {
                 case WifiManager.DATA_ACTIVITY_IN:
-                    mWifiActivityIconId = R.drawable.stat_sys_wifi_in;
+                    mWifiActivityIconId = R.drawable.stat_sys_signal_in;
                     break;
                 case WifiManager.DATA_ACTIVITY_OUT:
-                    mWifiActivityIconId = R.drawable.stat_sys_wifi_out;
+                    mWifiActivityIconId = R.drawable.stat_sys_signal_out;
                     break;
                 case WifiManager.DATA_ACTIVITY_INOUT:
-                    mWifiActivityIconId = R.drawable.stat_sys_wifi_inout;
+                    mWifiActivityIconId = R.drawable.stat_sys_signal_inout;
                     break;
                 case WifiManager.DATA_ACTIVITY_NONE:
-                    mWifiActivityIconId = 0;
+                    mWifiActivityIconId = R.drawable.stat_sys_signal_none;
                     break;
                 }
             }