From ecb5cdb170d4caceea603e15428cea6267c1dcf7 Mon Sep 17 00:00:00 2001 From: Rashed Abdel-Tawab Date: Sun, 30 Nov 2014 00:17:03 -0500 Subject: Status bar: Add HSPA+ icons Forward port H+ icon in the status bar when connected to HSPA+ Uses new vector drawables by blunden Change-Id: Ia745c524d5e2530f50f12f961ea8533a4c8f5842 --- packages/SystemUI/res/drawable/ic_qs_signal_hp.xml | 27 ++++++++++++++++++ .../drawable/stat_sys_data_fully_connected_hp.xml | 27 ++++++++++++++++++ packages/SystemUI/res/values/cm_strings.xml | 3 ++ .../statusbar/policy/MobileSignalController.java | 3 ++ .../statusbar/policy/NetworkControllerImpl.java | 1 + .../systemui/statusbar/policy/TelephonyIcons.java | 32 +++++++++++++++++++++- 6 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 packages/SystemUI/res/drawable/ic_qs_signal_hp.xml create mode 100644 packages/SystemUI/res/drawable/stat_sys_data_fully_connected_hp.xml diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_hp.xml b/packages/SystemUI/res/drawable/ic_qs_signal_hp.xml new file mode 100644 index 0000000..b8ff918 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_signal_hp.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_hp.xml b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_hp.xml new file mode 100644 index 0000000..a464e18 --- /dev/null +++ b/packages/SystemUI/res/drawable/stat_sys_data_fully_connected_hp.xml @@ -0,0 +1,27 @@ + + + + + diff --git a/packages/SystemUI/res/values/cm_strings.xml b/packages/SystemUI/res/values/cm_strings.xml index 8363efa..93b66e1 100644 --- a/packages/SystemUI/res/values/cm_strings.xml +++ b/packages/SystemUI/res/values/cm_strings.xml @@ -19,6 +19,9 @@ --> + + HSPA+ + %1$s - %2$s diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java index f79b428..33df7a8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -188,6 +188,9 @@ public class MobileSignalController extends SignalController< mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_HSDPA, hGroup); mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_HSUPA, hGroup); mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_HSPA, hGroup); + if (mConfig.hspaDataDistinguishable) { + hGroup = TelephonyIcons.HP; + } mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_HSPAP, hGroup); if (mConfig.show4gForLte) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java index b59f283..78507be 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java @@ -755,6 +755,7 @@ public class NetworkControllerImpl extends BroadcastReceiver datatype.equals("e") ? TelephonyIcons.E : datatype.equals("g") ? TelephonyIcons.G : datatype.equals("h") ? TelephonyIcons.H : + datatype.equals("h+") ? TelephonyIcons.HP : datatype.equals("lte") ? TelephonyIcons.LTE : datatype.equals("roam") ? TelephonyIcons.ROAMING : TelephonyIcons.UNKNOWN; 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 68f8191..d770681 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java @@ -153,6 +153,20 @@ class TelephonyIcons { static final int QS_DATA_H = R.drawable.ic_qs_signal_h; + //HSPA+ + static final int[][] DATA_HP = { + { R.drawable.stat_sys_data_fully_connected_hp, + R.drawable.stat_sys_data_fully_connected_hp, + R.drawable.stat_sys_data_fully_connected_hp, + R.drawable.stat_sys_data_fully_connected_hp }, + { R.drawable.stat_sys_data_fully_connected_hp, + R.drawable.stat_sys_data_fully_connected_hp, + R.drawable.stat_sys_data_fully_connected_hp, + R.drawable.stat_sys_data_fully_connected_hp } + }; + + static final int QS_DATA_HP = R.drawable.ic_qs_signal_hp; + //CDMA // Use 3G icons for EVDO data and 1x icons for 1XRTT data static final int[][] DATA_1X = { @@ -215,6 +229,7 @@ class TelephonyIcons { static final int ICON_G = R.drawable.stat_sys_data_fully_connected_g; static final int ICON_E = R.drawable.stat_sys_data_fully_connected_e; static final int ICON_H = R.drawable.stat_sys_data_fully_connected_h; + static final int ICON_HP = R.drawable.stat_sys_data_fully_connected_hp; static final int ICON_3G = R.drawable.stat_sys_data_fully_connected_3g; static final int ICON_4G = R.drawable.stat_sys_data_fully_connected_4g; static final int ICON_4G_PLUS = R.drawable.stat_sys_data_fully_connected_4g_plus; @@ -338,12 +353,27 @@ class TelephonyIcons { TelephonyIcons.TELEPHONY_NO_NETWORK, TelephonyIcons.QS_TELEPHONY_NO_NETWORK, AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], - R.string.accessibility_data_connection_3_5g, + R.string.accessibility_data_connection_hspa, TelephonyIcons.ICON_H, false, TelephonyIcons.QS_DATA_H ); + static final MobileIconGroup HP = new MobileIconGroup( + "HP", + TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH, + TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH, + AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, + 0, 0, + TelephonyIcons.TELEPHONY_NO_NETWORK, + TelephonyIcons.QS_TELEPHONY_NO_NETWORK, + AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], + R.string.accessibility_data_connection_hspap, + TelephonyIcons.ICON_HP, + false, + TelephonyIcons.QS_DATA_HP + ); + static final MobileIconGroup FOUR_G = new MobileIconGroup( "4G", TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH, -- cgit v1.1