diff options
14 files changed, 46 insertions, 6 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 122133c..94bd208 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -827,12 +827,14 @@ public abstract class BatteryStats implements Parcelable { public static final int DATA_CONNECTION_LTE = 13; public static final int DATA_CONNECTION_EHRPD = 14; public static final int DATA_CONNECTION_HSPAP = 15; - public static final int DATA_CONNECTION_OTHER = 16; + public static final int DATA_CONNECTION_DCHSPAP = 16; + public static final int DATA_CONNECTION_OTHER = 17; + static final String[] DATA_CONNECTION_NAMES = { "none", "gprs", "edge", "umts", "cdma", "evdo_0", "evdo_A", "1xrtt", "hsdpa", "hsupa", "hspa", "iden", "evdo_b", "lte", - "ehrpd", "hspap", "other" + "ehrpd", "hspap", "dchspap", "other" }; public static final int NUM_DATA_CONNECTION_TYPES = DATA_CONNECTION_OTHER+1; diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 201e1de..210d7d9 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -2018,6 +2018,9 @@ public final class BatteryStatsImpl extends BatteryStats { case TelephonyManager.NETWORK_TYPE_HSPAP: bin = DATA_CONNECTION_HSPAP; break; + case TelephonyManager.NETWORK_TYPE_DCHSPAP: + bin = DATA_CONNECTION_DCHSPAP; + break; default: bin = DATA_CONNECTION_OTHER; break; diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_dc.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_dc.png Binary files differnew file mode 100644 index 0000000..fca0113 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_connected_dc.png diff --git a/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_dc.png b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_dc.png Binary files differnew file mode 100644 index 0000000..1bd437d --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/stat_sys_data_fully_connected_dc.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_dc.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_dc.png Binary files differnew file mode 100644 index 0000000..d7209d4 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_connected_dc.png diff --git a/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_dc.png b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_dc.png Binary files differnew file mode 100644 index 0000000..b6b19fa --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/stat_sys_data_fully_connected_dc.png diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_dc.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_dc.png Binary files differnew file mode 100644 index 0000000..5db6593 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_connected_dc.png diff --git a/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_dc.png b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_dc.png Binary files differnew file mode 100644 index 0000000..609fa72 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/stat_sys_data_fully_connected_dc.png diff --git a/packages/SystemUI/res/values/cm_strings.xml b/packages/SystemUI/res/values/cm_strings.xml index 18a006e..5aff21f 100644 --- a/packages/SystemUI/res/values/cm_strings.xml +++ b/packages/SystemUI/res/values/cm_strings.xml @@ -18,6 +18,9 @@ <!-- 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 DC-HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_data_connection_DC">DCHSPAP</string> + <string name="accessibility_quick_settings_ringer">Sound <xliff:g id="state" example="Off">%s</xliff:g>.</string> <string name="accessibility_quick_settings_vibration">Vibration <xliff:g id="state" example="Off">%s</xliff:g>.</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 1a4718e..6a823fa 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -637,6 +637,12 @@ public class NetworkController extends BroadcastReceiver { mContentDescriptionDataType = mContext.getString( R.string.accessibility_data_connection_HP); break; + case TelephonyManager.NETWORK_TYPE_DCHSPAP: + mDataIconList = TelephonyIcons.DATA_DC[mInetCondition]; + mDataTypeIconId = R.drawable.stat_sys_data_connected_dc; + mContentDescriptionDataType = mContext.getString( + R.string.accessibility_data_connection_DC); + 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 db2be1f..4ac64b3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java @@ -123,6 +123,19 @@ class TelephonyIcons { R.drawable.stat_sys_data_fully_connected_hp } }; + // DC-HSPAP + static final int[][] DATA_DC = { + { R.drawable.stat_sys_data_connected_dc, + R.drawable.stat_sys_data_connected_dc, + R.drawable.stat_sys_data_connected_dc, + R.drawable.stat_sys_data_connected_dc }, + { R.drawable.stat_sys_data_fully_connected_dc, + R.drawable.stat_sys_data_fully_connected_dc, + R.drawable.stat_sys_data_fully_connected_dc, + R.drawable.stat_sys_data_fully_connected_dc } + }; + + //CDMA // Use 3G icons for EVDO data and 1x icons for 1XRTT data static final int[][] DATA_1X = { diff --git a/telephony/java/android/telephony/NeighboringCellInfo.java b/telephony/java/android/telephony/NeighboringCellInfo.java index 51e1e95..5371573 100644 --- a/telephony/java/android/telephony/NeighboringCellInfo.java +++ b/telephony/java/android/telephony/NeighboringCellInfo.java @@ -26,6 +26,7 @@ import static android.telephony.TelephonyManager.NETWORK_TYPE_HSDPA; import static android.telephony.TelephonyManager.NETWORK_TYPE_HSUPA; import static android.telephony.TelephonyManager.NETWORK_TYPE_HSPA; import static android.telephony.TelephonyManager.NETWORK_TYPE_HSPAP; +import static android.telephony.TelephonyManager.NETWORK_TYPE_DCHSPAP; /** * Represents the neighboring cell information, including @@ -108,7 +109,8 @@ public class NeighboringCellInfo implements Parcelable * {@link TelephonyManager#NETWORK_TYPE_HSDPA TelephonyManager.NETWORK_TYPE_HSDPA}, * {@link TelephonyManager#NETWORK_TYPE_HSUPA TelephonyManager.NETWORK_TYPE_HSUPA}, * {@link TelephonyManager#NETWORK_TYPE_HSPA TelephonyManager.NETWORK_TYPE_HSPA}, - * and {@link TelephonyManager#NETWORK_TYPE_HSPAP TelephonyManager.NETWORK_TYPE_HSPAP}. + * {@link TelephonyManager#NETWORK_TYPE_HSPAP TelephonyManager.NETWORK_TYPE_HSPAP}, + * and {@link TelephonyManager#NETWORK_TYPE_DCHSPAP TelephonyManager.NETWORK_TYPE_DCHSPAP}. */ public NeighboringCellInfo(int rssi, String location, int radioType) { // set default value @@ -144,6 +146,7 @@ public class NeighboringCellInfo implements Parcelable case NETWORK_TYPE_HSUPA: case NETWORK_TYPE_HSPA: case NETWORK_TYPE_HSPAP: + case NETWORK_TYPE_DCHSPAP: mNetworkType = radioType; mPsc = Integer.valueOf(location, 16); break; @@ -220,7 +223,8 @@ public class NeighboringCellInfo implements Parcelable * {@link TelephonyManager#NETWORK_TYPE_HSDPA TelephonyManager.NETWORK_TYPE_HSDPA}, * {@link TelephonyManager#NETWORK_TYPE_HSUPA TelephonyManager.NETWORK_TYPE_HSUPA}, * {@link TelephonyManager#NETWORK_TYPE_HSPA TelephonyManager.NETWORK_TYPE_HSPA}, - * or {@link TelephonyManager#NETWORK_TYPE_HSPAP TelephonyManager.NETWORK_TYPE_HSPAP} + * {@link TelephonyManager#NETWORK_TYPE_HSPAP TelephonyManager.NETWORK_TYPE_HSPAP}, + * or {@link TelephonyManager#NETWORK_TYPE_DCHSPAP TelephonyManager.NETWORK_TYPE_DCHSPAP} * means that Neighboring Cell information is stored for UMTS network, in * which {@link NeighboringCellInfo#getPsc NeighboringCellInfo.getPsc} * should be called to access location. diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 2fc8414..6e834db 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -455,9 +455,11 @@ public class ServiceState implements Parcelable { rtString = "LTE"; break; case RIL_RADIO_TECHNOLOGY_HSPAP: - case RIL_RADIO_TECHNOLOGY_DCHSPAP: rtString = "HSPAP"; break; + case RIL_RADIO_TECHNOLOGY_DCHSPAP: + rtString = "DCHSPAP"; + break; case RIL_RADIO_TECHNOLOGY_GSM: rtString = "GSM"; break; @@ -689,8 +691,9 @@ public class ServiceState implements Parcelable { case ServiceState.RIL_RADIO_TECHNOLOGY_LTE: return TelephonyManager.NETWORK_TYPE_LTE; case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP: - case ServiceState.RIL_RADIO_TECHNOLOGY_DCHSPAP: return TelephonyManager.NETWORK_TYPE_HSPAP; + case ServiceState.RIL_RADIO_TECHNOLOGY_DCHSPAP: + return TelephonyManager.NETWORK_TYPE_DCHSPAP; default: return TelephonyManager.NETWORK_TYPE_UNKNOWN; } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 2f80d39..2be14cf 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -566,6 +566,8 @@ public class TelephonyManager { public static final int NETWORK_TYPE_EHRPD = 14; /** Current network is HSPA+ */ public static final int NETWORK_TYPE_HSPAP = 15; + /** Current network is DC-HSPAP */ + public static final int NETWORK_TYPE_DCHSPAP = 30; /** * Returns a constant indicating the radio technology (network type) @@ -588,6 +590,7 @@ public class TelephonyManager { * @see #NETWORK_TYPE_LTE * @see #NETWORK_TYPE_EHRPD * @see #NETWORK_TYPE_HSPAP + * @see #NETWORK_TYPE_DCHSPAP */ public int getNetworkType() { try{ @@ -650,6 +653,7 @@ public class TelephonyManager { case NETWORK_TYPE_EVDO_B: case NETWORK_TYPE_EHRPD: case NETWORK_TYPE_HSPAP: + case NETWORK_TYPE_DCHSPAP: return NETWORK_CLASS_3_G; case NETWORK_TYPE_LTE: return NETWORK_CLASS_4_G; @@ -702,6 +706,8 @@ public class TelephonyManager { return "iDEN"; case NETWORK_TYPE_HSPAP: return "HSPA+"; + case NETWORK_TYPE_DCHSPAP: + return "DCHSPAP"; default: return "UNKNOWN"; } |
