summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_hp.pngbin0 -> 894 bytes
-rw-r--r--packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_hp.pngbin0 -> 195 bytes
-rw-r--r--packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_hp.pngbin0 -> 888 bytes
-rw-r--r--packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_hp.pngbin0 -> 169 bytes
-rw-r--r--packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_hp.pngbin0 -> 902 bytes
-rw-r--r--packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_hp.pngbin0 -> 264 bytes
-rw-r--r--packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_hp.pngbin0 -> 893 bytes
-rw-r--r--packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_hp.pngbin0 -> 234 bytes
-rw-r--r--packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_hp.pngbin0 -> 911 bytes
-rw-r--r--packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_hp.pngbin0 -> 294 bytes
-rw-r--r--packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_hp.pngbin0 -> 902 bytes
-rw-r--r--packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_hp.pngbin0 -> 264 bytes
-rw-r--r--packages/SystemUI/res/values/strings.xml3
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java7
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java12
15 files changed, 21 insertions, 1 deletions
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_hp.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_hp.png
new file mode 100644
index 0000000..015d772
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_hp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_hp.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_hp.png
new file mode 100644
index 0000000..b34466a
--- /dev/null
+++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_hp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_hp.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_hp.png
new file mode 100644
index 0000000..6a43502
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_hp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_hp.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_hp.png
new file mode 100644
index 0000000..c3382eb
--- /dev/null
+++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_hp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_hp.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_hp.png
new file mode 100644
index 0000000..2ef8d75
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_connected_hp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_hp.png b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_hp.png
new file mode 100644
index 0000000..d88202c
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw720dp-hdpi/stat_sys_data_fully_connected_hp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_hp.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_hp.png
new file mode 100644
index 0000000..250e32a
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_connected_hp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_hp.png b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_hp.png
new file mode 100644
index 0000000..f494068
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw720dp-mdpi/stat_sys_data_fully_connected_hp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_hp.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_hp.png
new file mode 100644
index 0000000..19bcae5
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_connected_hp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_hp.png b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_hp.png
new file mode 100644
index 0000000..b2e4adb
--- /dev/null
+++ b/packages/SystemUI/res/drawable-sw720dp-xhdpi/stat_sys_data_fully_connected_hp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_hp.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_hp.png
new file mode 100644
index 0000000..2ef8d75
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_hp.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_hp.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_hp.png
new file mode 100644
index 0000000..d88202c
--- /dev/null
+++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_hp.png
Binary files differ
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index ab883ce..b07a5e7 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -317,6 +317,9 @@
<!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_data_connection_3.5g">3.5G</string>
+ <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+ <string name="accessibility_data_connection_HP">HSPA+</string>
+
<!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
<string name="accessibility_data_connection_4g">4G</string>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
index bbb90c8..19d9f8c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -613,7 +613,6 @@ public class NetworkController extends BroadcastReceiver {
case TelephonyManager.NETWORK_TYPE_HSDPA:
case TelephonyManager.NETWORK_TYPE_HSUPA:
case TelephonyManager.NETWORK_TYPE_HSPA:
- case TelephonyManager.NETWORK_TYPE_HSPAP:
if (mHspaDataDistinguishable) {
mDataIconList = TelephonyIcons.DATA_H[mInetCondition];
mDataTypeIconId = R.drawable.stat_sys_data_connected_h;
@@ -628,6 +627,12 @@ public class NetworkController extends BroadcastReceiver {
R.string.accessibility_data_connection_3g);
}
break;
+ case TelephonyManager.NETWORK_TYPE_HSPAP:
+ mDataIconList = TelephonyIcons.DATA_HP[mInetCondition];
+ mDataTypeIconId = R.drawable.stat_sys_data_connected_hp;
+ mContentDescriptionDataType = mContext.getString(
+ R.string.accessibility_data_connection_HP);
+ break;
case TelephonyManager.NETWORK_TYPE_CDMA:
if (!mShowAtLeastThreeGees) {
// display 1xRTT for IS95A/B
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 3b953a0..db2be1f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java
@@ -111,6 +111,18 @@ class TelephonyIcons {
R.drawable.stat_sys_data_fully_connected_h }
};
+ //HPSPA+
+ static final int[][] DATA_HP = {
+ { R.drawable.stat_sys_data_connected_hp,
+ R.drawable.stat_sys_data_connected_hp,
+ R.drawable.stat_sys_data_connected_hp,
+ R.drawable.stat_sys_data_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 }
+ };
+
//CDMA
// Use 3G icons for EVDO data and 1x icons for 1XRTT data
static final int[][] DATA_1X = {