Merge "Set phone/data signal icon ids to 0 in airplane mode" into jb-dev

Author: Andrew Flynn

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

@@ -1000,7 +1000,7 @@ void refreshViews() {
             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) {