diff options
| author | Adrian Roos <roosa@google.com> | 2015-06-16 01:17:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-16 01:18:01 +0000 |
| commit | 2bfe96513884f0c4a4836a615a80e17a1ba30173 (patch) | |
| tree | 4bcfb77b4a711f2b08977dfe57e0db84fccd5f4c /packages | |
| parent | 9a2da54e3c7b5f382d2654eeb5228b945edd8e39 (diff) | |
| parent | 54d031bf032b93a6a27968d601d04eca41598c95 (diff) | |
| download | frameworks_base-2bfe96513884f0c4a4836a615a80e17a1ba30173.zip frameworks_base-2bfe96513884f0c4a4836a615a80e17a1ba30173.tar.gz frameworks_base-2bfe96513884f0c4a4836a615a80e17a1ba30173.tar.bz2 | |
Merge "Fix unnecessairy announcements when collapsing shade" into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java | 2 |
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; } |