diff --git a/core/res/res/drawable/stat_sys_data_connected_1x.png b/core/res/res/drawable/stat_sys_data_connected_1x.png new file mode 100644 index 0000000000000..130724fd05507 Binary files /dev/null and b/core/res/res/drawable/stat_sys_data_connected_1x.png differ diff --git a/core/res/res/drawable/stat_sys_data_connected_1xrtt.png b/core/res/res/drawable/stat_sys_data_connected_1xrtt.png deleted file mode 100644 index c2fbbdfbc4faf..0000000000000 Binary files a/core/res/res/drawable/stat_sys_data_connected_1xrtt.png and /dev/null differ diff --git a/core/res/res/drawable/stat_sys_data_connected_evdo.png b/core/res/res/drawable/stat_sys_data_connected_evdo.png deleted file mode 100644 index db9f282e7b970..0000000000000 Binary files a/core/res/res/drawable/stat_sys_data_connected_evdo.png and /dev/null differ diff --git a/core/res/res/drawable/stat_sys_data_dormant_1xrtt.png b/core/res/res/drawable/stat_sys_data_dormant_1xrtt.png deleted file mode 100755 index 11c2eaebb1ab1..0000000000000 Binary files a/core/res/res/drawable/stat_sys_data_dormant_1xrtt.png and /dev/null differ diff --git a/core/res/res/drawable/stat_sys_data_dormant_evdo.png b/core/res/res/drawable/stat_sys_data_dormant_evdo.png deleted file mode 100755 index 811fcb56f8ae7..0000000000000 Binary files a/core/res/res/drawable/stat_sys_data_dormant_evdo.png and /dev/null differ diff --git a/core/res/res/drawable/stat_sys_data_in_1x.png b/core/res/res/drawable/stat_sys_data_in_1x.png new file mode 100644 index 0000000000000..3155e632fe7b4 Binary files /dev/null and b/core/res/res/drawable/stat_sys_data_in_1x.png differ diff --git a/core/res/res/drawable/stat_sys_data_in_1xrtt.png b/core/res/res/drawable/stat_sys_data_in_1xrtt.png deleted file mode 100644 index a421a8a45bba4..0000000000000 Binary files a/core/res/res/drawable/stat_sys_data_in_1xrtt.png and /dev/null differ diff --git a/core/res/res/drawable/stat_sys_data_in_evdo.png b/core/res/res/drawable/stat_sys_data_in_evdo.png deleted file mode 100644 index 54f55bac0ad88..0000000000000 Binary files a/core/res/res/drawable/stat_sys_data_in_evdo.png and /dev/null differ diff --git a/core/res/res/drawable/stat_sys_data_inandout_1x.png b/core/res/res/drawable/stat_sys_data_inandout_1x.png new file mode 100644 index 0000000000000..1017e3bb41662 Binary files /dev/null and b/core/res/res/drawable/stat_sys_data_inandout_1x.png differ diff --git a/core/res/res/drawable/stat_sys_data_inandout_1xrtt.png b/core/res/res/drawable/stat_sys_data_inandout_1xrtt.png deleted file mode 100644 index 1a94cdfe0b6f5..0000000000000 Binary files a/core/res/res/drawable/stat_sys_data_inandout_1xrtt.png and /dev/null differ diff --git a/core/res/res/drawable/stat_sys_data_inandout_evdo.png b/core/res/res/drawable/stat_sys_data_inandout_evdo.png deleted file mode 100644 index 7aa6f00f2ddea..0000000000000 Binary files a/core/res/res/drawable/stat_sys_data_inandout_evdo.png and /dev/null differ diff --git a/core/res/res/drawable/stat_sys_data_out_1x.png b/core/res/res/drawable/stat_sys_data_out_1x.png new file mode 100644 index 0000000000000..54187912f6b80 Binary files /dev/null and b/core/res/res/drawable/stat_sys_data_out_1x.png differ diff --git a/core/res/res/drawable/stat_sys_data_out_1xrtt.png b/core/res/res/drawable/stat_sys_data_out_1xrtt.png deleted file mode 100644 index 74fd351e564c5..0000000000000 Binary files a/core/res/res/drawable/stat_sys_data_out_1xrtt.png and /dev/null differ diff --git a/core/res/res/drawable/stat_sys_data_out_evdo.png b/core/res/res/drawable/stat_sys_data_out_evdo.png deleted file mode 100644 index 21e19a713f936..0000000000000 Binary files a/core/res/res/drawable/stat_sys_data_out_evdo.png and /dev/null differ diff --git a/services/java/com/android/server/status/StatusBarPolicy.java b/services/java/com/android/server/status/StatusBarPolicy.java index 65b2ddb4075ce..10680dd99cf0f 100644 --- a/services/java/com/android/server/status/StatusBarPolicy.java +++ b/services/java/com/android/server/status/StatusBarPolicy.java @@ -253,19 +253,12 @@ public class StatusBarPolicy { }; //CDMA - private static final int[] sDataNetType_evdo = new int[] { - com.android.internal.R.drawable.stat_sys_data_connected_evdo, - com.android.internal.R.drawable.stat_sys_data_in_evdo, - com.android.internal.R.drawable.stat_sys_data_out_evdo, - com.android.internal.R.drawable.stat_sys_data_inandout_evdo, - com.android.internal.R.drawable.stat_sys_data_dormant_evdo, - }; - private static final int[] sDataNetType_1xrtt = new int[] { - com.android.internal.R.drawable.stat_sys_data_connected_1xrtt, - com.android.internal.R.drawable.stat_sys_data_in_1xrtt, - com.android.internal.R.drawable.stat_sys_data_out_1xrtt, - com.android.internal.R.drawable.stat_sys_data_inandout_1xrtt, - com.android.internal.R.drawable.stat_sys_data_dormant_1xrtt, + // Use 3G icons for EVDO data and 1x icons for 1XRTT data + private static final int[] sDataNetType_1x = new int[] { + com.android.internal.R.drawable.stat_sys_data_connected_1x, + com.android.internal.R.drawable.stat_sys_data_in_1x, + com.android.internal.R.drawable.stat_sys_data_out_1x, + com.android.internal.R.drawable.stat_sys_data_inandout_1x, }; // Assume it's all good unless we hear otherwise. We don't always seem @@ -971,14 +964,14 @@ public class StatusBarPolicy { break; case TelephonyManager.NETWORK_TYPE_CDMA: // display 1xRTT for IS95A/B - mDataIconList = this.sDataNetType_1xrtt; + mDataIconList = this.sDataNetType_1x; break; case TelephonyManager.NETWORK_TYPE_1xRTT: - mDataIconList = this.sDataNetType_1xrtt; + mDataIconList = this.sDataNetType_1x; break; case TelephonyManager.NETWORK_TYPE_EVDO_0: //fall through case TelephonyManager.NETWORK_TYPE_EVDO_A: - mDataIconList = sDataNetType_evdo; + mDataIconList = sDataNetType_3g; break; default: mDataIconList = sDataNetType_g; @@ -1031,8 +1024,6 @@ public class StatusBarPolicy { iconId = mDataIconList[3]; break; case TelephonyManager.DATA_ACTIVITY_DORMANT: - iconId = mDataIconList[4]; - break; default: iconId = mDataIconList[0]; break;