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

am 1971df5d: am e20a19cb: Merge "show 3G icon for CDMA/1xRTT"

Browse Source 
* commit '1971df5d4296f077cccff704201057a32b733235':
  show 3G icon for CDMA/1xRTT
This commit is contained in:
Wink Saville
2012-08-04 08:12:48 -07:00
committed by Android Git Automerger
parent b49a065d99 1971df5d42
commit bb01fd0111
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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