Display H icon for HSPA RAT's

Add a check to display H icon for HSPA RAT's.

Change-Id: Ie8155eb4590b61f79215d3277648d112d9055073
CR-Fixed: 968357

diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_h_plus.xml b/packages/SystemUI/res/drawable/ic_qs_signal_h_plus.xml
index 2059368..29644d0 100644 (file)
--- a/packages/SystemUI/res/drawable/ic_qs_signal_h_plus.xml
+++ b/packages/SystemUI/res/drawable/ic_qs_signal_h_plus.xml
@@ -28,7 +28,7 @@
   IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="30dp"
+    android:width="22dp"
     android:height="27dp"
     android:viewportWidth="30"
     android:viewportHeight="27">

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
index ae0b27e..3ae3aaa 100644 (file)
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
@@ -438,13 +438,21 @@ class TelephonyIcons {
             case TelephonyManager.NETWORK_TYPE_HSDPA:
             case TelephonyManager.NETWORK_TYPE_HSUPA:
             case TelephonyManager.NETWORK_TYPE_HSPA:
-                if (hspaDistinguishable) {
-                    mSelectedDataActivityIndex[slot] = DATA_TYPE_H;
-                    mSelectedDataTypeIcon[slot] = mRes.getIdentifier(
-                            dataTypeArray[type], null, NS);
-                    mSelectedQSDataTypeIcon[slot] = QS_DATA_H;
+                if (hspaDistinguishable || MobileSignalController.isCarrierOneSupported()) {
                     mSelectedDataTypeDesc[slot] = mDataTypeDescriptionArray[type];
-                    mSelectedSignalStreagthIndex[slot] = SIGNAL_STRENGTH_TYPE_H;
+                    if (type == TelephonyManager.NETWORK_TYPE_HSPA &&
+                            MobileSignalController.isCarrierOneSupported()) {
+                        mSelectedDataActivityIndex[slot] = DATA_TYPE_HP;
+                        mSelectedDataTypeIcon[slot] = ICON_H_PLUS;
+                        mSelectedQSDataTypeIcon[slot] = QS_DATA_H_PLUS;
+                        mSelectedSignalStreagthIndex[slot] = SIGNAL_STRENGTH_TYPE_HP;
+                    } else {
+                        mSelectedDataActivityIndex[slot] = DATA_TYPE_H;
+                        mSelectedDataTypeIcon[slot] = mRes.getIdentifier(
+                                dataTypeArray[type], null, NS);
+                        mSelectedQSDataTypeIcon[slot] = QS_DATA_H;
+                        mSelectedSignalStreagthIndex[slot] = SIGNAL_STRENGTH_TYPE_H;
+                    }
                 } else {
                     mSelectedDataActivityIndex[slot] = DATA_TYPE_3G;
                     mSelectedDataTypeIcon[slot] = mRes.getIdentifier(
@@ -456,7 +464,8 @@ class TelephonyIcons {
                 }
                 break;
             case TelephonyManager.NETWORK_TYPE_HSPAP:
-                if (hspaDistinguishable) {
+                if (hspaDistinguishable || MobileSignalController.
+                        isCarrierOneSupported()) {
                     mSelectedDataActivityIndex[slot] = DATA_TYPE_HP;
                     mSelectedDataTypeIcon[slot] = mRes.getIdentifier(
                             dataTypeArray[type], null, NS);