diff options
| author | Jason Monk <jmonk@google.com> | 2015-07-09 19:09:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 19:09:32 +0000 |
| commit | de5df114269fd038adfc72c644b138f1da90b7bd (patch) | |
| tree | ec89ac43622cda6d068c7037488ae151a83d4747 /packages/SystemUI | |
| parent | 0a9b6a52d75543dc3508daa6ce1dd131fb90296b (diff) | |
| parent | 8969817a83e2ed5f28f67bd5f7f4de14a5455139 (diff) | |
| download | frameworks_base-de5df114269fd038adfc72c644b138f1da90b7bd.zip frameworks_base-de5df114269fd038adfc72c644b138f1da90b7bd.tar.gz frameworks_base-de5df114269fd038adfc72c644b138f1da90b7bd.tar.bz2 | |
am 8969817a: Merge "Fix roaming icon when not default signal" into mnc-dev
* commit '8969817a83e2ed5f28f67bd5f7f4de14a5455139':
Fix roaming icon when not default signal
Diffstat (limited to 'packages/SystemUI')
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java index b1c650e..65ed7ce 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -223,7 +223,8 @@ public class MobileSignalController extends SignalController< boolean activityOut = mCurrentState.dataConnected && !mCurrentState.carrierNetworkChangeMode && mCurrentState.activityOut; - showDataIcon &= mCurrentState.isDefault; + showDataIcon &= mCurrentState.isDefault + || mCurrentState.iconGroup == TelephonyIcons.ROAMING; int typeIcon = showDataIcon ? icons.mDataType : 0; mCallbackHandler.setMobileDataIndicators(statusIcon, qsIcon, typeIcon, qsTypeIcon, activityIn, activityOut, dataContentDescription, description, icons.mIsWide, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java index 168aebe..52dea40 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java @@ -127,6 +127,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN; testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) { setupDefaultSignal(); + setConnectivity(NetworkCapabilities.TRANSPORT_CELLULAR, false, false); setGsmRoaming(true); setLevel(testStrength); |