From 898d173b92fb78d56bce208da31808d0852c7762 Mon Sep 17 00:00:00 2001 From: Selim Cinek Date: Mon, 29 Feb 2016 19:57:35 -0800 Subject: [PATCH] Expanding first child in a group now if it's the only one When expanding notifications, the first child is now expanded if it's the only one in there. Bug: 27419554 Change-Id: Icdadbb7036e4cd5964de4c2e96e6a8322052bc93 --- .../statusbar/stack/NotificationChildrenContainer.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java index 123a5c39d61a..495aa7a4ba55 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java @@ -262,10 +262,14 @@ public class NotificationChildrenContainer extends ViewGroup { } private void updateExpansionStates() { - // Let's make the first child expanded if the parent is - for (int i = 0; i < mChildren.size(); i++) { + if (mChildrenExpanded || mUserLocked) { + // we don't modify it the group is expanded or if we are expanding it + return; + } + int size = mChildren.size(); + for (int i = 0; i < size; i++) { ExpandableNotificationRow child = mChildren.get(i); - child.setSystemChildExpanded(false); + child.setSystemChildExpanded(i == 0 && size == 1); } } @@ -489,6 +493,7 @@ public class NotificationChildrenContainer extends ViewGroup { public void setChildrenExpanded(boolean childrenExpanded) { mChildrenExpanded = childrenExpanded; + updateExpansionStates(); } public void setNotificationParent(ExpandableNotificationRow parent) { -- 2.11.0