diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-12-07 15:31:59 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-12-12 10:05:58 -0800 |
| commit | 02b98156165c56c1e8d563cf3e33d097ffe8762b (patch) | |
| tree | 1d0527ae296dd7f503c3c9826411226c084b5d3b /packages/SystemUI/tests | |
| parent | ce0e7c836343facd20724a26b36255d1d6eb1d55 (diff) | |
| download | frameworks_base-02b98156165c56c1e8d563cf3e33d097ffe8762b.zip frameworks_base-02b98156165c56c1e8d563cf3e33d097ffe8762b.tar.gz frameworks_base-02b98156165c56c1e8d563cf3e33d097ffe8762b.tar.bz2 | |
SystemUI: Revert CAF UI modifications
Revert "SystemUI: Support display for radio tech"
This reverts commit 598421095aacb599d4bc8e8fcea20734d7847d0c.
Revert "SystemUI: Customize StatusBar for Chinese carrier"
This reverts commit d473d0b22ac8704c39d5eedd0d7b12f60a2fa215.
Revert "Statusbar: Add customized icons for Chinese carrier"
This reverts commit a6324c7293bebeff4c6ccee8c2a8af38b7a150a8.
Change-Id: Ib03c7455a04bd7d63a8c0a7d238040099e94e89c
Diffstat (limited to 'packages/SystemUI/tests')
2 files changed, 3 insertions, 15 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java index 5e840f5..00b8de2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java @@ -104,8 +104,8 @@ public class CallbackHandlerTest extends AndroidTestCase { int qsType = R.drawable.ic_qs_signal_1x; boolean wide = true; int subId = 5; - mHandler.setMobileDataIndicators(status, qs, type, qsType, in, out, 0, 0, 0, 0, - typeDescription, description, wide, subId); + mHandler.setMobileDataIndicators(status, qs, type, qsType, in, out, typeDescription, + description, wide, subId); waitForCallbacks(); ArgumentCaptor<IconState> statusArg = ArgumentCaptor.forClass(IconState.class); @@ -120,11 +120,7 @@ public class CallbackHandlerTest extends AndroidTestCase { ArgumentCaptor<Integer> subIdArg = ArgumentCaptor.forClass(Integer.class); Mockito.verify(mSignalCallback).setMobileDataIndicators(statusArg.capture(), qsArg.capture(), typeIconArg.capture(), qsTypeIconArg.capture(), inArg.capture(), - outArg.capture(), ArgumentCaptor.forClass(Integer.class).capture(), - ArgumentCaptor.forClass(Integer.class).capture(), - ArgumentCaptor.forClass(Integer.class).capture(), - ArgumentCaptor.forClass(Integer.class).capture(), - typeContentArg.capture(), descArg.capture(), wideArg.capture(), + outArg.capture(), typeContentArg.capture(), descArg.capture(), wideArg.capture(), subIdArg.capture()); assertEquals(status, statusArg.getValue()); assertEquals(qs, qsArg.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 58cb6ff..30c08cd 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 @@ -276,10 +276,6 @@ public class NetworkControllerBaseTest extends SysuiTestCase { iconArg.capture(), ArgumentCaptor.forClass(Integer.class).capture(), typeIconArg.capture(), dataInArg.capture(), dataOutArg.capture(), - ArgumentCaptor.forClass(Integer.class).capture(), - ArgumentCaptor.forClass(Integer.class).capture(), - ArgumentCaptor.forClass(Integer.class).capture(), - ArgumentCaptor.forClass(Integer.class).capture(), ArgumentCaptor.forClass(String.class).capture(), ArgumentCaptor.forClass(String.class).capture(), ArgumentCaptor.forClass(Boolean.class).capture(), @@ -306,10 +302,6 @@ public class NetworkControllerBaseTest extends SysuiTestCase { ArgumentCaptor.forClass(Integer.class).capture(), ArgumentCaptor.forClass(Boolean.class).capture(), ArgumentCaptor.forClass(Boolean.class).capture(), - ArgumentCaptor.forClass(Integer.class).capture(), - ArgumentCaptor.forClass(Integer.class).capture(), - ArgumentCaptor.forClass(Integer.class).capture(), - ArgumentCaptor.forClass(Integer.class).capture(), ArgumentCaptor.forClass(String.class).capture(), ArgumentCaptor.forClass(String.class).capture(), ArgumentCaptor.forClass(Boolean.class).capture(), |