am 5f6e00d8: am 2bfe9651: Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev

* commit '5f6e00d809ae8b027ba84ccd9363742f1401e323':
  Fix unnecessairy announcements when collapsing shade
This commit is contained in:
Adrian Roos
2015-06-16 01:31:53 +00:00
committed by Android Git Automerger

View File

@@ -1263,7 +1263,7 @@ public class NotificationPanelView extends PanelView implements
setQsExpanded(true); setQsExpanded(true);
} else if (height <= mQsMinExpansionHeight && mQsExpanded) { } else if (height <= mQsMinExpansionHeight && mQsExpanded) {
setQsExpanded(false); setQsExpanded(false);
if (mLastAnnouncementWasQuickSettings && !mTracking) { if (mLastAnnouncementWasQuickSettings && !mTracking && !isCollapsing()) {
announceForAccessibility(getKeyguardOrLockScreenString()); announceForAccessibility(getKeyguardOrLockScreenString());
mLastAnnouncementWasQuickSettings = false; mLastAnnouncementWasQuickSettings = false;
} }