drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop showing "No internet connection" when there is one." into ics-mr1

Browse Source
This commit is contained in:
Daniel Sandler
2012-01-24 12:54:48 -08:00
committed by Android (Google) Code Review
parent 7eeaf3f07a 2e481b9146
commit 185c0ef7e4
1 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -890,34 +890,40 @@ public class NetworkController extends BroadcastReceiver {
if (!mHasMobileDataFeature) {
mDataSignalIconId = mPhoneSignalIconId = 0;
} else if (mDataConnected) {
mobileLabel = mNetworkName;
mobileLabel = "";
} else {
// We want to show the carrier name even if data is not being routed over that link, so
// we look only at the service state here.
mobileLabel = hasService()
? mNetworkName
: context.getString(R.string.status_bar_settings_signal_meter_disconnected);
if (DEBUG) {
mobileLabel += "yyyyYYYYyyyyYYYY";
}
combinedSignalIconId = mDataSignalIconId;
switch (mDataActivity) {
case TelephonyManager.DATA_ACTIVITY_IN:
mMobileActivityIconId = R.drawable.stat_sys_signal_in;
break;
case TelephonyManager.DATA_ACTIVITY_OUT:
mMobileActivityIconId = R.drawable.stat_sys_signal_out;
break;
case TelephonyManager.DATA_ACTIVITY_INOUT:
mMobileActivityIconId = R.drawable.stat_sys_signal_inout;
break;
default:
mMobileActivityIconId = 0;
break;
}
combinedLabel = mobileLabel;
combinedActivityIconId = mMobileActivityIconId;
combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()
mContentDescriptionCombinedSignal = mContentDescriptionDataType;
} else {
mobileLabel = mHasMobileDataFeature ?
context.getString(R.string.status_bar_settings_signal_meter_disconnected) : "";
// Now for things that should only be shown when actually using mobile data.
if (mDataConnected) {
combinedSignalIconId = mDataSignalIconId;
switch (mDataActivity) {
case TelephonyManager.DATA_ACTIVITY_IN:
mMobileActivityIconId = R.drawable.stat_sys_signal_in;
break;
case TelephonyManager.DATA_ACTIVITY_OUT:
mMobileActivityIconId = R.drawable.stat_sys_signal_out;
break;
case TelephonyManager.DATA_ACTIVITY_INOUT:
mMobileActivityIconId = R.drawable.stat_sys_signal_inout;
break;
default:
mMobileActivityIconId = 0;
break;
}
combinedLabel = mobileLabel;
combinedActivityIconId = mMobileActivityIconId;
combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()
mContentDescriptionCombinedSignal = mContentDescriptionDataType;
}
}
if (mWifiConnected) {
@ -949,6 +955,12 @@ public class NetworkController extends BroadcastReceiver {
combinedLabel = wifiLabel;
combinedSignalIconId = mWifiIconId; // set by updateWifiIcons()
mContentDescriptionCombinedSignal = mContentDescriptionWifi;
} else {
if (mHasMobileDataFeature) {
wifiLabel = "";
} else {
wifiLabel = context.getString(R.string.status_bar_settings_signal_meter_disconnected);
}
}
if (mBluetoothTethered) {
@ -969,9 +981,17 @@ public class NetworkController extends BroadcastReceiver {
mDataTypeIconId = 0;
// combined values from connected wifi take precedence over airplane mode
if (!mWifiConnected) {
wifiLabel = context.getString(R.string.status_bar_settings_signal_meter_disconnected);
combinedLabel = wifiLabel;
if (mWifiConnected) {
// Suppress "No internet connection." from mobile if wifi connected.
mobileLabel = "";
} else {
if (mHasMobileDataFeature) {
// let the mobile icon show "No internet connection."
wifiLabel = "";
} else {
wifiLabel = context.getString(R.string.status_bar_settings_signal_meter_disconnected);
combinedLabel = wifiLabel;
}
mContentDescriptionCombinedSignal = mContentDescriptionPhoneSignal;
combinedSignalIconId = mDataSignalIconId;
}