diff options
| author | Jason Monk <jmonk@google.com> | 2015-07-09 18:55:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-09 18:55:06 +0000 |
| commit | 5859910463df29324df868f30e0ff66440cf161f (patch) | |
| tree | d4622ec8f7a5ebf792b70db0754e7b76298172d4 | |
| parent | 8969817a83e2ed5f28f67bd5f7f4de14a5455139 (diff) | |
| parent | 7150d7fa357e00b2904ff3bcf9e06a1014bfbb39 (diff) | |
| download | frameworks_base-5859910463df29324df868f30e0ff66440cf161f.zip frameworks_base-5859910463df29324df868f30e0ff66440cf161f.tar.gz frameworks_base-5859910463df29324df868f30e0ff66440cf161f.tar.bz2 | |
Merge "Remove data icon for WFC" into mnc-dev
3 files changed, 21 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 65ed7ce..82224d4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -191,7 +191,7 @@ public class MobileSignalController extends SignalController< } else { mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_LTE, TelephonyIcons.LTE); } - mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_IWLAN, TelephonyIcons.FOUR_G); + mNetworkToIconLookup.put(TelephonyManager.NETWORK_TYPE_IWLAN, TelephonyIcons.WFC); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java index 8a27653..83e0446 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/TelephonyIcons.java @@ -245,6 +245,18 @@ class TelephonyIcons { TelephonyIcons.QS_DATA_3G ); + static final MobileIconGroup WFC = new MobileIconGroup( + "WFC", + TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH, + TelephonyIcons.QS_TELEPHONY_SIGNAL_STRENGTH, + AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH, + 0, 0, + TelephonyIcons.TELEPHONY_NO_NETWORK, + TelephonyIcons.QS_TELEPHONY_NO_NETWORK, + AccessibilityContentDescriptions.PHONE_SIGNAL_STRENGTH[0], + 0, 0, false, 0 + ); + static final MobileIconGroup UNKNOWN = new MobileIconGroup( "Unknown", TelephonyIcons.TELEPHONY_SIGNAL_STRENGTH, diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java index e60e0a6..360562c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java @@ -71,6 +71,14 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { TelephonyIcons.QS_DATA_H); } + public void testWfcNoDataIcon() { + setupDefaultSignal(); + updateDataConnectionState(TelephonyManager.DATA_CONNECTED, + TelephonyManager.NETWORK_TYPE_IWLAN); + + verifyDataIndicators(0, 0); + } + public void test4gDataIcon() { // Switch to showing 4g icon and re-initialize the NetworkController. mConfig.show4gForLte = true; |