diff options
| author | Jason Monk <jmonk@google.com> | 2015-07-08 14:19:25 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2015-07-08 14:19:25 -0400 |
| commit | 61633f18611731d7011facbfe3d14f3ec83d86a3 (patch) | |
| tree | acf98a9f50917d6e17e2be8d028679ff77be9ba1 /packages/SystemUI | |
| parent | 32c4802a8ac624e0426888612533a4d649f349b9 (diff) | |
| download | frameworks_base-61633f18611731d7011facbfe3d14f3ec83d86a3.zip frameworks_base-61633f18611731d7011facbfe3d14f3ec83d86a3.tar.gz frameworks_base-61633f18611731d7011facbfe3d14f3ec83d86a3.tar.bz2 | |
Fix roaming icon when not default signal
Bug: 22183802
Change-Id: I0d38f23d81b79e53e3d92db8c6f6a1455a94da4c
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); |