Fix data icon issue for LTE_CA

Define new data type for LTE_CA and use it to fetch data icons based on data activity for displaying on status bar. Add new 4G+ data icons. Change-Id: Ie6c87d331e5e56090f01069b08c01d9de413be64 CRs-Fixed: 900830
SlimRoms · Feb 1, 2016 · 0985ad8 · 0985ad8
1 parent 05e0f8b
commit 0985ad8
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 3 deletions.
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_idle_4g_plus.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_idle_4g_plus.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_4g_plus.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_in_4g_plus.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_4g_plus.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_inandout_4g_plus.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_4g_plus.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_out_4g_plus.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4g_plus_in.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4g_plus_in.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4g_plus_inout.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4g_plus_inout.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4g_plus_no.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4g_plus_no.png
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4g_plus_out.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_signal_4g_plus_out.png
diff --git a/packages/SystemUI/res/values/arrays.xml b/packages/SystemUI/res/values/arrays.xml
@@ -176,6 +176,7 @@
         <item>array/telephony_data_activity_hp_sim1</item>
         <item>array/telephony_data_activity_1x_sim1</item>
         <item>array/telephony_data_activity_lte_sim1</item>
+        <item>array/telephony_data_activity_4g_plus_sim1</item>
     </string-array>
 
     <!--reserved for overlay-->
@@ -268,6 +269,14 @@
         <item>0</item>
     </string-array>
 
+    <string-array name="telephony_data_activity_4g_plus_sim1">
+        <item>0</item>
+        <item>drawable/stat_sys_signal_in_auto_mirrored</item>
+        <item>drawable/stat_sys_signal_out_auto_mirrored</item>
+        <item>drawable/stat_sys_signal_inout_auto_mirrored</item>
+        <item>0</item>
+    </string-array>
+
     <!--reserved for overlay-->
     <string-array name="telephony_data_activity_4g_sim2">
     </string-array>

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
@@ -273,6 +273,7 @@ class TelephonyIcons {
     static final int DATA_TYPE_HP = 7;
     static final int DATA_TYPE_1X = 8;
     static final int DATA_TYPE_LTE = 9;
+    static final int DATA_TYPE_4G_PLUS = 10;
 
     static final int SIGNAL_STRENGTH_TYPE_G = 0;
     static final int SIGNAL_STRENGTH_TYPE_E = 1;
@@ -514,13 +515,15 @@ static void updateDataType(int slot, int type, boolean showAtLeast3G,
             case TelephonyManager.NETWORK_TYPE_LTE:
             case TelephonyManager.NETWORK_TYPE_LTE_CA:
                 if (show4GforLte) {
-                    mSelectedDataActivityIndex[slot] = DATA_TYPE_4G;
-                    mSelectedDataTypeIcon[slot] = mRes.getIdentifier(
-                        mDataTypeGenerationArray[1], null, NS);
                     if ( type == TelephonyManager.NETWORK_TYPE_LTE_CA) {
+                        mSelectedDataActivityIndex[slot] = DATA_TYPE_4G_PLUS;
                         //Select 4G+ icon.
                         mSelectedDataTypeIcon[slot] = mRes.getIdentifier(
                                 mDataTypeGenerationArray[2], null, NS);
+                    } else {
+                        mSelectedDataActivityIndex[slot] = DATA_TYPE_4G;
+                        mSelectedDataTypeIcon[slot] = mRes.getIdentifier(
+                                mDataTypeGenerationArray[1], null, NS);
                     }
                     mSelectedQSDataTypeIcon[slot] = QS_DATA_4G;
                     mSelectedDataTypeDesc[slot] = mDataTypeGenerationDescArray[1];