summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2015-06-15 18:16:58 -0700
committerAdrian Roos <roosa@google.com>2015-06-15 18:17:16 -0700
commit54d031bf032b93a6a27968d601d04eca41598c95 (patch)
treebc129f8e8792df61b802b9db60f2d27f043d9ebc /packages
parent2d4dc8db64d0f75e530451acb2c0bea97b9264ff (diff)
downloadframeworks_base-54d031bf032b93a6a27968d601d04eca41598c95.zip
frameworks_base-54d031bf032b93a6a27968d601d04eca41598c95.tar.gz
frameworks_base-54d031bf032b93a6a27968d601d04eca41598c95.tar.bz2
Fix unnecessairy announcements when collapsing shade
Bug: 20171694 Change-Id: Iec73098e2f778dac4a920a717385139952017330
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java2
1 files changed, 1 insertions, 1 deletions
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 @@ public class NotificationPanelView extends PanelView implements
setQsExpanded(true);
} else if (height <= mQsMinExpansionHeight && mQsExpanded) {
setQsExpanded(false);
- if (mLastAnnouncementWasQuickSettings && !mTracking) {
+ if (mLastAnnouncementWasQuickSettings && !mTracking && !isCollapsing()) {
announceForAccessibility(getKeyguardOrLockScreenString());
mLastAnnouncementWasQuickSettings = false;
}