summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorAndrew Flynn <flynn@google.com>2012-05-29 12:20:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-29 12:20:21 -0700
commit10864c544207f607f1f551284ca6fbf4dc63cc2f (patch)
treef8ca09f56ae183b40da4a269ed10302242806eae /packages/SystemUI
parentdfcdde790299ade3417a89cf8ff1aa9f3c46e5a3 (diff)
parent15332efd2c4dd9b96368a58216e13d083638dbae (diff)
downloadframeworks_base-10864c544207f607f1f551284ca6fbf4dc63cc2f.zip
frameworks_base-10864c544207f607f1f551284ca6fbf4dc63cc2f.tar.gz
frameworks_base-10864c544207f607f1f551284ca6fbf4dc63cc2f.tar.bz2
am 15332efd: Merge "Set phone/data signal icon ids to 0 in airplane mode" into jb-dev
* commit '15332efd2c4dd9b96368a58216e13d083638dbae': Set phone/data signal icon ids to 0 in airplane mode
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java2
1 files changed, 1 insertions, 1 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 c65f581..584a69e4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
@@ -1000,7 +1000,7 @@ public class NetworkController extends BroadcastReceiver {
mContentDescriptionPhoneSignal = mContext.getString(
R.string.accessibility_airplane_mode);
mAirplaneIconId = R.drawable.stat_sys_signal_flightmode;
- mDataTypeIconId = 0;
+ mPhoneSignalIconId = mDataSignalIconId = mDataTypeIconId = 0;
// combined values from connected wifi take precedence over airplane mode
if (mWifiConnected) {