commit 54d031bf032b93a6a27968d601d04eca41598c95
author Adrian Roos <roosa@google.com> Mon Jun 15 18:16:58 2015 -0700
committer Adrian Roos <roosa@google.com> Mon Jun 15 18:17:16 2015 -0700
tree bc129f8e8792df61b802b9db60f2d27f043d9ebc
parent 2d4dc8db64d0f75e530451acb2c0bea97b9264ff

Fix unnecessairy announcements when collapsing shade

Bug: 20171694
Change-Id: Iec73098e2f778dac4a920a717385139952017330

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index a750572..e3b1b9f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -1263,7 +1263,7 @@
             setQsExpanded(true);
         } else if (height <= mQsMinExpansionHeight && mQsExpanded) {
             setQsExpanded(false);
-            if (mLastAnnouncementWasQuickSettings && !mTracking) {
+            if (mLastAnnouncementWasQuickSettings && !mTracking && !isCollapsing()) {
                 announceForAccessibility(getKeyguardOrLockScreenString());
                 mLastAnnouncementWasQuickSettings = false;
             }