diff options
author | Adnan <adnan@cyngn.com> | 2014-12-16 14:41:10 -0800 |
---|---|---|
committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-12-16 23:26:12 +0000 |
commit | 9bb2da1373abfb59805a7e73453bc1d5b349116b (patch) | |
tree | 5dd6631371891f9197609cf0a9177512af7db609 | |
parent | 15e59e742c82ee7ac5deaf1b5fb20594230c3ac8 (diff) | |
download | android_frameworks_base-shipping/cm-11.0.tar.gz android_frameworks_base-shipping/cm-11.0.tar.bz2 android_frameworks_base-shipping/cm-11.0.zip |
Only discard the roaming icon if we're not roaming anymore.cm-11.0-XNPH05Q-tomato-9828f8e9ccshipping/cm-11.0
Ignore data roaming toggle because it shouldn't have impact on whether
we show the indicator or not.
Change-Id: I445c1005a935eaca9d0a132d5a5a7fd214b300d0
(cherry picked from commit 682198e36cc5ddf6fda1f8c0c566187346242ba3)
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkController.java | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkController.java index 57d44abcc86..f3a40c55639 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkController.java @@ -663,11 +663,6 @@ public class MSimNetworkController extends NetworkController { // DSDS case: Data is active only on DDS. Clear the icon for NON-DDS int dataSub = MSimTelephonyManager.getDefault().getPreferredDataSubscription(); - // Clear roaming if we're always showing an indicator - if (SystemProperties.getBoolean("ro.config.always_show_roaming", false)) { - mMSimDataRoamIconId[subscription] = 0; - } - if (subscription != dataSub) { if (DEBUG) { Slog.d(TAG,"updateDataNetType: SUB" + subscription @@ -845,6 +840,8 @@ public class MSimNetworkController extends NetworkController { } if (subscription == dataSub) mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition]; + } else if (!mPhone.isNetworkRoaming(subscription)) { + mMSimDataRoamIconId[subscription] = 0; } } @@ -1058,11 +1055,6 @@ public class MSimNetworkController extends NetworkController { final boolean emergencyOnly = isEmergencyOnly(); // All sims are emergency only int dataSub = MSimTelephonyManager.getDefault().getPreferredDataSubscription(); - // Clear roaming if we're always showing an indicator - if (SystemProperties.getBoolean("ro.config.always_show_roaming", false)) { - mMSimDataRoamIconId[subscription] = 0; - } - if (DEBUG) { Slog.d(TAG,"refreshViews subscription =" + subscription + "mMSimDataConnected =" + mMSimDataConnected[subscription]); @@ -1243,6 +1235,8 @@ public class MSimNetworkController extends NetworkController { } if (subscription == dataSub) mQSDataTypeIconId = TelephonyIcons.QS_DATA_R[mInetCondition]; + } else if (!mPhone.isNetworkRoaming(subscription)) { + mMSimDataRoamIconId[subscription] = 0; } } |