summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2015-07-07 22:28:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-07 22:28:32 +0000
commit027efdfd6bd9076a38bc14e7fad52ea9930d93f2 (patch)
tree8101fe9c40c42f6757b9452b8ff40f4c54d69c10 /packages/SystemUI
parentcceb8268a12743b78593e34df662e45a8ee618ed (diff)
parentcffb98c8d77c743165d06f588ba5a5e424796349 (diff)
downloadframeworks_base-027efdfd6bd9076a38bc14e7fad52ea9930d93f2.zip
frameworks_base-027efdfd6bd9076a38bc14e7fad52ea9930d93f2.tar.gz
frameworks_base-027efdfd6bd9076a38bc14e7fad52ea9930d93f2.tar.bz2
am cffb98c8: Merge "Fixed a bug where notification where invisible on the lockscreen" into mnc-dev
* commit 'cffb98c8d77c743165d06f588ba5a5e424796349': Fixed a bug where notification where invisible on the lockscreen
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java
index 7072dcb..950b162 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java
@@ -25,8 +25,6 @@ import com.android.systemui.statusbar.StatusBarState;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
/**
* A class to handle notifications and their corresponding groups.
@@ -143,7 +141,7 @@ public class NotificationGroupManager {
return true;
}
NotificationGroup group = mGroupMap.get(sbn.getGroupKey());
- if (group != null && group.expanded) {
+ if (group != null && (group.expanded || group.summary == null)) {
return true;
}
return false;