Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8969817a: Merge "Fix roaming icon when not default signal" into mnc-dev

Browse Source 
* commit '8969817a83e2ed5f28f67bd5f7f4de14a5455139':
  Fix roaming icon when not default signal
This commit is contained in:
Jason Monk
2015-07-09 19:09:32 +00:00
committed by Android Git Automerger
parent 0a9b6a52d7 8969817a83
commit de5df11426
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
View File

@@ -223,7 +223,8 @@ public class MobileSignalController extends SignalController<
boolean activityOut = mCurrentState.dataConnected boolean activityOut = mCurrentState.dataConnected
&& !mCurrentState.carrierNetworkChangeMode && !mCurrentState.carrierNetworkChangeMode
&& mCurrentState.activityOut; && mCurrentState.activityOut;
showDataIcon &= mCurrentState.isDefault; showDataIcon &= mCurrentState.isDefault
|| mCurrentState.iconGroup == TelephonyIcons.ROAMING;
int typeIcon = showDataIcon ? icons.mDataType : 0; int typeIcon = showDataIcon ? icons.mDataType : 0;
mCallbackHandler.setMobileDataIndicators(statusIcon, qsIcon, typeIcon, qsTypeIcon, mCallbackHandler.setMobileDataIndicators(statusIcon, qsIcon, typeIcon, qsTypeIcon,
activityIn, activityOut, dataContentDescription, description, icons.mIsWide, activityIn, activityOut, dataContentDescription, description, icons.mIsWide,

1
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java
View File

@@ -127,6 +127,7 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest {
for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN; for (int testStrength = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) { testStrength <= SignalStrength.SIGNAL_STRENGTH_GREAT; testStrength++) {
setupDefaultSignal(); setupDefaultSignal();
setConnectivity(NetworkCapabilities.TRANSPORT_CELLULAR, false, false);
setGsmRoaming(true); setGsmRoaming(true);
setLevel(testStrength); setLevel(testStrength);