drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Fixes issue with group backgrounds when animating to keyguard\" into nyc-dev

Browse Source 
am: 8363980d45

Change-Id: Iee12dc78f65a0e4acb09f513fd9578f28f7a5e2e
This commit is contained in:
Mady Mellor 2016-06-15 23:27:41 +00:00 committed by android-build-merger
commit 3cb4c159f7
1 changed files with 2 additions and 2 deletions

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

@ -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();
}