Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0729cd5f authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed a bug where the content wasn\'t transforming in a group" into... 

Merge "Fixed a bug where the content wasn\'t transforming in a group" into nyc-dev am: fe03504c am: c71d4f84
am: 42829e0c

* commit '42829e0c':
  Fixed a bug where the content wasn't transforming in a group

Change-Id: I82750b8db09d12df598ef1b7050045dc9128afe4
parents d2944c59 42829e0c

packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ public class NotificationContentView extends FrameLayout { 
            }

        } else {

            if (noExpandedChild || (viewHeight <= mContractedChild.getHeight()

                    && (!mIsChildInGroup

                    && (!mIsChildInGroup || isGroupExpanded()

                            || !mContainingNotification.isExpanded(true /* allowOnKeyguard */)))) {

                return VISIBLE_TYPE_CONTRACTED;

            } else {