diff options
author | Mike Corrigan <michael.corrigan@motorola.com> | 2011-03-01 11:08:45 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-01 11:08:45 -0800 |
commit | 49853dc19c43dedbb09512c24ab55112e8b04cea (patch) | |
tree | 6b903a6f7c9188711654c109de91b3b95785b9d2 /packages | |
parent | 5d019f0e6d57cdd633aa976a8a0f221941afd343 (diff) | |
parent | bd15112a29eefb93e62235574b694746044c9261 (diff) | |
download | frameworks_base-49853dc19c43dedbb09512c24ab55112e8b04cea.zip frameworks_base-49853dc19c43dedbb09512c24ab55112e8b04cea.tar.gz frameworks_base-49853dc19c43dedbb09512c24ab55112e8b04cea.tar.bz2 |
am bd15112a: Fix the display priority of the airplane mode icon.
* commit 'bd15112a29eefb93e62235574b694746044c9261':
Fix the display priority of the airplane mode icon.
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index f2c838a..0dc7e8d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -98,6 +98,8 @@ public class NetworkController extends BroadcastReceiver { private int mInetCondition = 0; private static final int INET_CONDITION_THRESHOLD = 50; + private boolean mAirplaneMode = false; + // our ui Context mContext; ArrayList<ImageView> mPhoneSignalIconViews = new ArrayList<ImageView>(); @@ -155,8 +157,12 @@ public class NetworkController extends BroadcastReceiver { filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); filter.addAction(ConnectivityManager.INET_CONDITION_ACTION); filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED); + filter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED); context.registerReceiver(this, filter); + // AIRPLANE_MODE_CHANGED is sent at boot; we've probably already missed it + updateAirplaneMode(); + // yuck mBatteryStats = BatteryStatsService.getService(); } @@ -212,6 +218,9 @@ public class NetworkController extends BroadcastReceiver { refreshViews(); } else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) { refreshViews(); + } else if (action.equals(Intent.ACTION_AIRPLANE_MODE_CHANGED)) { + updateAirplaneMode(); + refreshViews(); } } @@ -379,18 +388,16 @@ public class NetworkController extends BroadcastReceiver { return (levelEvdoDbm < levelEvdoSnr) ? levelEvdoDbm : levelEvdoSnr; } + private void updateAirplaneMode() { + mAirplaneMode = (Settings.System.getInt(mContext.getContentResolver(), + Settings.System.AIRPLANE_MODE_ON, 0) == 1); + } + private final void updateTelephonySignalStrength() { - // Display signal strength while in "emergency calls only" mode - if (mServiceState == null || (!hasService() && !mServiceState.isEmergencyOnly())) { + if (!hasService()) { //Slog.d(TAG, "updateTelephonySignalStrength: no service"); - if (Settings.System.getInt(mContext.getContentResolver(), - Settings.System.AIRPLANE_MODE_ON, 0) == 1) { - mPhoneSignalIconId = R.drawable.stat_sys_signal_flightmode; - mDataSignalIconId = R.drawable.stat_sys_signal_flightmode; - } else { - mPhoneSignalIconId = R.drawable.stat_sys_signal_null; - mDataSignalIconId = R.drawable.stat_sys_signal_0; // note we use 0 instead of null - } + mPhoneSignalIconId = R.drawable.stat_sys_signal_null; + mDataSignalIconId = R.drawable.stat_sys_signal_0; // note we use 0 instead of null } else { if (mSignalStrength == null) { mPhoneSignalIconId = R.drawable.stat_sys_signal_null; @@ -734,6 +741,12 @@ public class NetworkController extends BroadcastReceiver { label = mContext.getString(R.string.bluetooth_tethered); combinedSignalIconId = mBluetoothTetherIconId; dataTypeIconId = 0; + } else if (mAirplaneMode && + (mServiceState == null || (!hasService() && !mServiceState.isEmergencyOnly()))) { + // Only display the flight-mode icon if not in "emergency calls only" mode. + label = context.getString(R.string.status_bar_settings_signal_meter_disconnected); + combinedSignalIconId = R.drawable.stat_sys_signal_flightmode; + dataTypeIconId = 0; } else { label = context.getString(R.string.status_bar_settings_signal_meter_disconnected); // On devices without mobile radios, we want to show the wifi icon @@ -747,6 +760,7 @@ public class NetworkController extends BroadcastReceiver { + Integer.toHexString(combinedSignalIconId) + "/" + getResourceName(combinedSignalIconId) + " dataDirectionOverlayIconId=0x" + Integer.toHexString(dataDirectionOverlayIconId) + + " mAirplaneMode=" + mAirplaneMode + " mDataActivity=" + mDataActivity + " mPhoneSignalIconId=0x" + Integer.toHexString(mPhoneSignalIconId) + " mDataDirectionIconId=0x" + Integer.toHexString(mDataDirectionIconId) |