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

Commit e821f6de authored by Mady Mellor's avatar Mady Mellor Committed by android-build-merger
Browse files

Merge \\"Fixes issue with group backgrounds when animating to keyguard\\" into... 

Merge \\"Fixes issue with group backgrounds when animating to keyguard\\" into nyc-dev am: 8363980d
am: 337c7143

Change-Id: Ib0492e3f57c1ff6f04d2a5b1b589855dbf842362
parents 27a19903 337c7143

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

+2 −2
Original line number Diff line number Diff line
@@ -140,11 +140,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
        @Override

        public void onClick(View v) {

            if (!mShowingPublic && mGroupManager.isSummaryOfGroup(mStatusBarNotification)) {

                mGroupExpansionChanging = true;

                final boolean wasExpanded = mGroupManager.isGroupExpanded(mStatusBarNotification);

                boolean nowExpanded = mGroupManager.toggleGroupExpansion(mStatusBarNotification);

                mOnExpandClickListener.onExpandClicked(mEntry, nowExpanded);

                mGroupExpansionChanging = true;

                updateBackgroundForGroupState();

                MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTIFICATION_GROUP_EXPANDER,

                        nowExpanded);

                logExpansionEvent(true /* userAction */, wasExpanded);
@@ -1343,6 +1342,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
        if (mChildrenContainer != null) {

            mChildrenContainer.setChildrenExpanded(expanded);

        }

        updateBackgroundForGroupState();

        updateClickAndFocus();

    }