Code drop from //branches/cupcake/...@124589
diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java
index f47d679..0bd950b 100644
--- a/src/com/android/settings/AirplaneModeEnabler.java
+++ b/src/com/android/settings/AirplaneModeEnabler.java
@@ -100,9 +100,10 @@
*/
private void onAirplaneModeChanged() {
ServiceState serviceState = mPhoneStateReceiver.getServiceState();
- boolean isPhoneOff = serviceState.getState() == ServiceState.STATE_POWER_OFF;
- mCheckBoxPref.setChecked(isPhoneOff);
- mCheckBoxPref.setSummary(R.string.airplane_mode_summary);
+ boolean airplaneModeEnabled = serviceState.getState() == ServiceState.STATE_POWER_OFF;
+ mCheckBoxPref.setChecked(airplaneModeEnabled);
+ mCheckBoxPref.setSummary(airplaneModeEnabled ? null :
+ mContext.getString(R.string.airplane_mode_summary));
mCheckBoxPref.setEnabled(true);
}