Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "show 3G icon for CDMA/1xRTT"

Browse Source
This commit is contained in:
Wink Saville
2012-08-04 07:51:26 -07:00
committed by android code review
parent d2237dfe7d 68cad3a0fa
commit e20a19cb54
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
View File

@@ -568,18 +568,26 @@ public class NetworkController extends BroadcastReceiver {
} }
break; break;
case TelephonyManager.NETWORK_TYPE_CDMA: case TelephonyManager.NETWORK_TYPE_CDMA:
if (!mShowAtLeastThreeGees) {
// display 1xRTT for IS95A/B // display 1xRTT for IS95A/B
mDataIconList = TelephonyIcons.DATA_1X[mInetCondition]; mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];
mDataTypeIconId = R.drawable.stat_sys_data_connected_1x; mDataTypeIconId = R.drawable.stat_sys_data_connected_1x;
mContentDescriptionDataType = mContext.getString( mContentDescriptionDataType = mContext.getString(
R.string.accessibility_data_connection_cdma); R.string.accessibility_data_connection_cdma);
break; break;
} else {
// fall through
}
case TelephonyManager.NETWORK_TYPE_1xRTT: case TelephonyManager.NETWORK_TYPE_1xRTT:
if (!mShowAtLeastThreeGees) {
mDataIconList = TelephonyIcons.DATA_1X[mInetCondition]; mDataIconList = TelephonyIcons.DATA_1X[mInetCondition];
mDataTypeIconId = R.drawable.stat_sys_data_connected_1x; mDataTypeIconId = R.drawable.stat_sys_data_connected_1x;
mContentDescriptionDataType = mContext.getString( mContentDescriptionDataType = mContext.getString(
R.string.accessibility_data_connection_cdma); R.string.accessibility_data_connection_cdma);
break; break;
} else {
// fall through
}
case TelephonyManager.NETWORK_TYPE_EVDO_0: //fall through case TelephonyManager.NETWORK_TYPE_EVDO_0: //fall through
case TelephonyManager.NETWORK_TYPE_EVDO_A: case TelephonyManager.NETWORK_TYPE_EVDO_A:
case TelephonyManager.NETWORK_TYPE_EVDO_B: case TelephonyManager.NETWORK_TYPE_EVDO_B: