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

am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1

Browse Source 
* commit '47e4015ba23c507196980dcb4a311afc7e2358b1':
  Avoid airplane mode labels when Wi-Fi enabled.
This commit is contained in:
Jeff Sharkey
2011-11-30 11:46:19 -08:00
committed by Android Git Automerger
parent 4661a05bef 47e4015ba2
commit 827eed06cd
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -898,7 +898,7 @@ public class NetworkController extends BroadcastReceiver {
combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon() combinedSignalIconId = mDataSignalIconId; // set by updateDataIcon()
mContentDescriptionCombinedSignal = mContentDescriptionDataType; mContentDescriptionCombinedSignal = mContentDescriptionDataType;
} }
if (mWifiConnected) { if (mWifiConnected) {
if (mWifiSsid == null) { if (mWifiSsid == null) {
label = context.getString(R.string.status_bar_settings_signal_meter_wifi_nossid); label = context.getString(R.string.status_bar_settings_signal_meter_wifi_nossid);
@@ -932,19 +932,23 @@ public class NetworkController extends BroadcastReceiver {
mContentDescriptionCombinedSignal = mContext.getString( mContentDescriptionCombinedSignal = mContext.getString(
R.string.accessibility_bluetooth_tether); R.string.accessibility_bluetooth_tether);
} }
if (mAirplaneMode && if (mAirplaneMode &&
(mServiceState == null || (!hasService() && !mServiceState.isEmergencyOnly()))) { (mServiceState == null || (!hasService() && !mServiceState.isEmergencyOnly()))) {
// Only display the flight-mode icon if not in "emergency calls only" mode. // Only display the flight-mode icon if not in "emergency calls only" mode.
label = context.getString(R.string.status_bar_settings_signal_meter_disconnected);
mContentDescriptionCombinedSignal = mContentDescriptionPhoneSignal
= mContext.getString(R.string.accessibility_airplane_mode);
// look again; your radios are now airplanes // look again; your radios are now airplanes
mContentDescriptionPhoneSignal = mContext.getString(
R.string.accessibility_airplane_mode);
mPhoneSignalIconId = mDataSignalIconId = R.drawable.stat_sys_signal_flightmode; mPhoneSignalIconId = mDataSignalIconId = R.drawable.stat_sys_signal_flightmode;
mDataTypeIconId = 0; mDataTypeIconId = 0;
combinedSignalIconId = mDataSignalIconId; // combined values from connected wifi take precedence over airplane mode
if (!mWifiConnected) {
label = context.getString(R.string.status_bar_settings_signal_meter_disconnected);
mContentDescriptionCombinedSignal = mContentDescriptionPhoneSignal;
combinedSignalIconId = mDataSignalIconId;
}
} }
else if (!mDataConnected && !mWifiConnected && !mBluetoothTethered && !mWimaxConnected) { else if (!mDataConnected && !mWifiConnected && !mBluetoothTethered && !mWimaxConnected) {
// pretty much totally disconnected // pretty much totally disconnected