diff --git a/packages/SystemUI/res/anim/ic_signal_blink_1.xml b/packages/SystemUI/res/anim/ic_signal_blink_1.xml index ab1905af4e760..64580d189c0d9 100644 --- a/packages/SystemUI/res/anim/ic_signal_blink_1.xml +++ b/packages/SystemUI/res/anim/ic_signal_blink_1.xml @@ -23,16 +23,16 @@ android:valueType="colorType"> + android:value="?attr/fillColor"/> + android:value="?attr/fillColor"/> + android:value="?attr/backgroundColor"/> + android:value="?attr/backgroundColor"/> diff --git a/packages/SystemUI/res/anim/ic_signal_blink_2.xml b/packages/SystemUI/res/anim/ic_signal_blink_2.xml index 1b7ace252ea3c..f055cd0785582 100644 --- a/packages/SystemUI/res/anim/ic_signal_blink_2.xml +++ b/packages/SystemUI/res/anim/ic_signal_blink_2.xml @@ -23,22 +23,22 @@ android:valueType="colorType"> + android:value="?attr/backgroundColor"/> + android:value="?attr/backgroundColor"/> + android:value="?attr/fillColor"/> + android:value="?attr/fillColor"/> + android:value="?attr/backgroundColor"/> + android:value="?attr/backgroundColor"/> diff --git a/packages/SystemUI/res/anim/ic_signal_blink_3.xml b/packages/SystemUI/res/anim/ic_signal_blink_3.xml index cee831c0d7d33..abcd774102203 100644 --- a/packages/SystemUI/res/anim/ic_signal_blink_3.xml +++ b/packages/SystemUI/res/anim/ic_signal_blink_3.xml @@ -23,16 +23,16 @@ android:valueType="colorType"> + android:value="?attr/backgroundColor"/> + android:value="?attr/backgroundColor"/> + android:value="?attr/fillColor"/> + android:value="?attr/fillColor"/> diff --git a/packages/SystemUI/res/anim/ic_signal_dark_blink_1.xml b/packages/SystemUI/res/anim/ic_signal_dark_blink_1.xml deleted file mode 100644 index 9d398faad706c..0000000000000 --- a/packages/SystemUI/res/anim/ic_signal_dark_blink_1.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - diff --git a/packages/SystemUI/res/anim/ic_signal_dark_blink_2.xml b/packages/SystemUI/res/anim/ic_signal_dark_blink_2.xml deleted file mode 100644 index c6e213d2848ae..0000000000000 --- a/packages/SystemUI/res/anim/ic_signal_dark_blink_2.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - diff --git a/packages/SystemUI/res/anim/ic_signal_dark_blink_3.xml b/packages/SystemUI/res/anim/ic_signal_dark_blink_3.xml deleted file mode 100644 index dce148cf41009..0000000000000 --- a/packages/SystemUI/res/anim/ic_signal_dark_blink_3.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - diff --git a/packages/SystemUI/res/drawable/stat_sys_signal_dark_carrier_network_change_animation.xml b/packages/SystemUI/res/drawable/stat_sys_signal_dark_carrier_network_change_animation.xml deleted file mode 100644 index ff49d4cfdb139..0000000000000 --- a/packages/SystemUI/res/drawable/stat_sys_signal_dark_carrier_network_change_animation.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java index dcf0438b64adb..a9e8b383a8a00 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CellularTile.java @@ -162,10 +162,9 @@ public class CellularTile extends QSTile { } @Override - public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, - int darkStatusIcon, int statusType, int qsType, boolean activityIn, - boolean activityOut, String typeContentDescription, String description, - boolean isWide, int subId) { + public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType, + int qsType, boolean activityIn, boolean activityOut, String typeContentDescription, + String description, boolean isWide, int subId) { if (qsIcon == null) { // Not data sim, don't display. return; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index 991bde52a2541..a66f8ecb7ed82 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -180,13 +180,12 @@ public class SignalClusterView } @Override - public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int darkStatusIcon, - int statusType, int qsType, boolean activityIn, boolean activityOut, - String typeContentDescription, String description, boolean isWide, int subId) { + public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType, + int qsType, boolean activityIn, boolean activityOut, String typeContentDescription, + String description, boolean isWide, int subId) { PhoneState state = getOrInflateState(subId); state.mMobileVisible = statusIcon.visible; state.mMobileStrengthId = statusIcon.icon; - state.mMobileDarkStrengthId = darkStatusIcon; state.mMobileTypeId = statusType; state.mMobileDescription = statusIcon.contentDescription; state.mMobileTypeDescription = typeContentDescription; @@ -426,7 +425,7 @@ public class SignalClusterView private class PhoneState { private final int mSubId; private boolean mMobileVisible = false; - private int mMobileStrengthId = 0, mMobileDarkStrengthId = 0, mMobileTypeId = 0; + private int mMobileStrengthId = 0, mMobileTypeId = 0; private boolean mIsMobileTypeIconWide; private String mMobileDescription, mMobileTypeDescription; @@ -483,9 +482,8 @@ public class SignalClusterView mMobileDark.setPaddingRelative(mIsMobileTypeIconWide ? mWideTypeIconStartPadding : 0, 0, 0, 0); - if (DEBUG) Log.d(TAG, String.format("mobile: %s sig=%d dark=%d typ=%d", - (mMobileVisible ? "VISIBLE" : "GONE"), mMobileStrengthId, - mMobileDarkStrengthId, mMobileTypeId)); + if (DEBUG) Log.d(TAG, String.format("mobile: %s sig=%d typ=%d", + (mMobileVisible ? "VISIBLE" : "GONE"), mMobileStrengthId, mMobileTypeId)); mMobileType.setVisibility(mMobileTypeId != 0 ? View.VISIBLE : View.GONE); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java index 7f5219177e5fb..e618cb87887d0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CallbackHandler.java @@ -124,17 +124,16 @@ public class CallbackHandler extends Handler implements EmergencyListener, Signa @Override public void setMobileDataIndicators(final IconState statusIcon, final IconState qsIcon, - final int darkStatusIcon, final int statusType, final int qsType, - final boolean activityIn, final boolean activityOut, - final String typeContentDescription, final String description, final boolean isWide, - final int subId) { + final int statusType, final int qsType,final boolean activityIn, + final boolean activityOut, final String typeContentDescription, + final String description, final boolean isWide, final int subId) { post(new Runnable() { @Override public void run() { for (SignalCallback signalCluster : mSignalCallbacks) { - signalCluster.setMobileDataIndicators(statusIcon, qsIcon, darkStatusIcon, - statusType, qsType, activityIn, activityOut, typeContentDescription, - description, isWide, subId); + signalCluster.setMobileDataIndicators(statusIcon, qsIcon, statusType, qsType, + activityIn, activityOut, typeContentDescription, description, isWide, + subId); } } }); 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 0d5995325231d..cfc95bfba3726 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java @@ -117,7 +117,7 @@ public class MobileSignalController extends SignalController< public void setCarrierNetworkChangeMode(boolean carrierNetworkChangeMode) { mCurrentState.carrierNetworkChangeMode = carrierNetworkChangeMode; - notifyListenersIfNecessary(); + updateTelephony(); } /** @@ -220,13 +220,9 @@ public class MobileSignalController extends SignalController< && mCurrentState.activityOut; showDataIcon &= mCurrentState.isDefault; int typeIcon = showDataIcon ? icons.mDataType : 0; - mCallbackHandler.setMobileDataIndicators(statusIcon, qsIcon, getCurrentDarkIconId(), - typeIcon, qsTypeIcon, activityIn, activityOut, dataContentDescription, description, - icons.mIsWide, mSubscriptionInfo.getSubscriptionId()); - } - - private int getCurrentDarkIconId() { - return getCurrentIconId(false /* light */); + mCallbackHandler.setMobileDataIndicators(statusIcon, qsIcon, typeIcon, qsTypeIcon, + activityIn, activityOut, dataContentDescription, description, icons.mIsWide, + mSubscriptionInfo.getSubscriptionId()); } @Override @@ -478,17 +474,8 @@ public class MobileSignalController extends SignalController< int sbNullState, int qsNullState, int sbDiscState, int qsDiscState, int discContentDesc, int dataContentDesc, int dataType, boolean isWide, int qsDataType) { - this(name, sbIcons, sbIcons, qsIcons, contentDesc, sbNullState, qsNullState, - sbDiscState, sbDiscState, qsDiscState, discContentDesc, dataContentDesc, - dataType, isWide, qsDataType); - } - - public MobileIconGroup(String name, int[][] sbIcons, int[][] sbDarkIcons, int[][] qsIcons, - int[] contentDesc, int sbNullState, int qsNullState, int sbDiscState, - int sbDarkDiscState, int qsDiscState, int discContentDesc, int dataContentDesc, - int dataType, boolean isWide, int qsDataType) { - super(name, sbIcons, sbDarkIcons, qsIcons, contentDesc, sbNullState, qsNullState, - sbDiscState, sbDarkDiscState, qsDiscState, discContentDesc); + super(name, sbIcons, qsIcons, contentDesc, sbNullState, qsNullState, sbDiscState, + qsDiscState, discContentDesc); mDataContentDescription = dataContentDesc; mDataType = dataType; mIsWide = isWide; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index 070ca637d31e0..38656ee0781eb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -38,9 +38,9 @@ public interface NetworkController { void setWifiIndicators(boolean enabled, IconState statusIcon, IconState qsIcon, boolean activityIn, boolean activityOut, String description); - void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int darkStatusIcon, - int statusType, int qsType, boolean activityIn, boolean activityOut, - String typeContentDescription, String description, boolean isWide, int subId); + void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType, + int qsType, boolean activityIn, boolean activityOut, String typeContentDescription, + String description, boolean isWide, int subId); void setSubs(List subs); void setNoSims(boolean show); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalCallbackAdapter.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalCallbackAdapter.java index 83a7d3dd42fe8..dce889f831dab 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalCallbackAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalCallbackAdapter.java @@ -35,10 +35,9 @@ public class SignalCallbackAdapter implements SignalCallback { } @Override - public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, - int darkStatusIcon, int statusType, int qsType, boolean activityIn, - boolean activityOut, String typeContentDescription, String description, - boolean isWide, int subId) { + public void setMobileDataIndicators(IconState statusIcon, IconState qsIcon, int statusType, + int qsType, boolean activityIn, boolean activityOut, String typeContentDescription, + String description, boolean isWide, int subId) { } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java index e6ca64692079c..5e9447e57170f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java @@ -133,22 +133,10 @@ public abstract class SignalController statusArg = ArgumentCaptor.forClass(IconState.class); ArgumentCaptor qsArg = ArgumentCaptor.forClass(IconState.class); - ArgumentCaptor darkStrengthArg = ArgumentCaptor.forClass(Integer.class); ArgumentCaptor typeIconArg = ArgumentCaptor.forClass(Integer.class); ArgumentCaptor qsTypeIconArg = ArgumentCaptor.forClass(Integer.class); ArgumentCaptor inArg = ArgumentCaptor.forClass(Boolean.class); @@ -118,13 +116,12 @@ public class CallbackHandlerTest extends AndroidTestCase { ArgumentCaptor descArg = ArgumentCaptor.forClass(String.class); ArgumentCaptor wideArg = ArgumentCaptor.forClass(Boolean.class); ArgumentCaptor subIdArg = ArgumentCaptor.forClass(Integer.class); - Mockito.verify(mSignalCallback).setMobileDataIndicators(statusArg.capture(), qsArg.capture(), - darkStrengthArg.capture(), typeIconArg.capture(), qsTypeIconArg.capture(), - inArg.capture(), outArg.capture(), typeContentArg.capture(), descArg.capture(), - wideArg.capture(), subIdArg.capture()); + Mockito.verify(mSignalCallback).setMobileDataIndicators(statusArg.capture(), + qsArg.capture(), typeIconArg.capture(), qsTypeIconArg.capture(), inArg.capture(), + outArg.capture(), typeContentArg.capture(), descArg.capture(), wideArg.capture(), + subIdArg.capture()); assertEquals(status, statusArg.getValue()); assertEquals(qs, qsArg.getValue()); - assertEquals(dark, (int) darkStrengthArg.getValue()); assertEquals(type, (int) typeIconArg.getValue()); assertEquals(qsType, (int) qsTypeIconArg.getValue()); assertEquals(in, (boolean) inArg.getValue()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java index 2d6bb68a03a3d..441bb168a30b4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java @@ -258,7 +258,6 @@ public class NetworkControllerBaseTest extends SysuiTestCase { ArgumentCaptor.forClass(IconState.class).capture(), iconArg.capture(), ArgumentCaptor.forClass(Integer.class).capture(), - ArgumentCaptor.forClass(Integer.class).capture(), typeIconArg.capture(), dataInArg.capture(), dataOutArg.capture(), ArgumentCaptor.forClass(String.class).capture(), ArgumentCaptor.forClass(String.class).capture(), @@ -275,20 +274,14 @@ public class NetworkControllerBaseTest extends SysuiTestCase { } protected void verifyLastMobileDataIndicators(boolean visible, int icon, int typeIcon) { - verifyLastMobileDataIndicators(visible, icon, icon, typeIcon); - } - - protected void verifyLastMobileDataIndicators(boolean visible, int strengthIcon, - int darkStrengthIcon, int typeIcon) { ArgumentCaptor iconArg = ArgumentCaptor.forClass(IconState.class); - ArgumentCaptor darkStrengthIconArg = ArgumentCaptor.forClass(Integer.class); ArgumentCaptor typeIconArg = ArgumentCaptor.forClass(Integer.class); // TODO: Verify all fields. Mockito.verify(mCallbackHandler, Mockito.atLeastOnce()).setMobileDataIndicators( iconArg.capture(), ArgumentCaptor.forClass(IconState.class).capture(), - darkStrengthIconArg.capture(), typeIconArg.capture(), + typeIconArg.capture(), ArgumentCaptor.forClass(Integer.class).capture(), ArgumentCaptor.forClass(Boolean.class).capture(), ArgumentCaptor.forClass(Boolean.class).capture(), @@ -298,9 +291,6 @@ public class NetworkControllerBaseTest extends SysuiTestCase { ArgumentCaptor.forClass(Integer.class).capture()); IconState iconState = iconArg.getValue(); - assertEquals("Signal strength icon in status bar", strengthIcon, iconState.icon); - assertEquals("Signal strength icon (dark mode) in status bar", darkStrengthIcon, - (int) darkStrengthIconArg.getValue()); assertEquals("Data icon in status bar", typeIcon, (int) typeIconArg.getValue()); assertEquals("Visibility in status bar", visible, iconState.visible); } 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 874fdf90916f3..dd6f272404a5b 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 @@ -438,7 +438,6 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest { // Out of service and carrier network change is true, show special indicator verifyLastMobileDataIndicators(true /* visible */, TelephonyIcons.TELEPHONY_CARRIER_NETWORK_CHANGE[0][0] /* strengthIcon */, - TelephonyIcons.TELEPHONY_CARRIER_NETWORK_CHANGE_DARK[0][0] /* darkStrengthIcon */, 0 /* typeIcon */); // Revert back