commit 2fdbe128209f02725c645f29bff941efe865da56
author Andrew Flynn <flynn@google.com> Mon Jun 01 16:34:21 2015 -0400
committer Andrew Flynn <flynn@google.com> Mon Jun 01 16:45:41 2015 -0400
tree 111425300d7e3805712f0326d22297040f2bc663
parent 3b7f9615b70c7e62a018eb1abf0a52c8ba3e4d27

Remove separate light/dark animated vector drawables

Now that AnimatedVectorDrawables can use themed animations, SysUI no longer
needs to track separate AVDs for the carrier network change icons.

Bug: 21118142
Change-Id: Ifb6d7b5e7e3de85c10bc13183b4142fd2e6714b6

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java

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 2d6bb68..441bb16 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 @@
                     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 @@
     }
 
     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<IconState> iconArg = ArgumentCaptor.forClass(IconState.class);
-        ArgumentCaptor<Integer> darkStrengthIconArg = ArgumentCaptor.forClass(Integer.class);
         ArgumentCaptor<Integer> 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 @@
                 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);
     }