commit 2de69553a7f9c021f10aa061f449daa1da9e6f78
author Eugene Susla <eugenesusla@google.com> Tue Mar 20 13:22:17 2018 -0700
committer Eugene Susla <eugenesusla@google.com> Tue Mar 27 22:35:03 2018 +0000
tree 3713e65f843f4e24ececf54144250cb0c6448cb1
parent 56e9c026b33da783088c10a3d1162076a8e25cb6

[DO NOT MERGE] Fix a11y action "expand notifications" when QS is open

Fixes: 23486398
Test: ensure attached bug is fixed
Change-Id: I34eb265615fb26c86351d45f27227f4009ce2d09
(cherry picked from commit ec0710e3aa050241b726f571faf6e6b3c34c35d9)

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java

diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
index f81ffd8..49dab4a 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
@@ -161,8 +161,8 @@
 
         mMetricsLogger = new FakeMetricsLogger();
         mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger);
-        mNotificationLogger = new NotificationLogger();
         mDependency.injectTestDependency(NotificationLogger.class, mNotificationLogger);
+        mNotificationLogger = new NotificationLogger();
 
         IPowerManager powerManagerService = mock(IPowerManager.class);
         HandlerThread handlerThread = new HandlerThread("TestThread");
@@ -514,9 +514,9 @@
         mStatusBar.disable(StatusBarManager.DISABLE_NONE, StatusBarManager.DISABLE2_NONE, false);
         verify(mNotificationPanelView).setQsExpansionEnabled(true);
         mStatusBar.animateExpandNotificationsPanel();
-        verify(mNotificationPanelView).expand(anyBoolean());
+        verify(mNotificationPanelView).expandWithoutQs();
         mStatusBar.animateExpandSettingsPanel(null);
-        verify(mNotificationPanelView).expand(anyBoolean());
+        verify(mNotificationPanelView).expandWithQs();
     }
 
     @Test