diff options
| author | Rashed Abdel-Tawab <rashed@linux.com> | 2014-11-30 00:17:03 -0500 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-12-12 10:07:27 -0800 |
| commit | ecb5cdb170d4caceea603e15428cea6267c1dcf7 (patch) | |
| tree | 7cfc3f9eb98d6a974a62f6a8cead38867ac77e15 /packages/SystemUI/src/com | |
| parent | 02b98156165c56c1e8d563cf3e33d097ffe8762b (diff) | |
| download | frameworks_base-ecb5cdb170d4caceea603e15428cea6267c1dcf7.zip frameworks_base-ecb5cdb170d4caceea603e15428cea6267c1dcf7.tar.gz frameworks_base-ecb5cdb170d4caceea603e15428cea6267c1dcf7.tar.bz2 | |
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
Diffstat (limited to 'packages/SystemUI/src/com')
3 files changed, 35 insertions, 1 deletions
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, |