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
This commit is contained in:
Mady Mellor
2016-06-15 23:20:22 +00:00
committed by Android (Google) Code Review
parent 0caf0b7259 1a5d8eadd5
commit 8363980d45
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,11 +140,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (!mShowingPublic && mGroupManager.isSummaryOfGroup(mStatusBarNotification)) { if (!mShowingPublic && mGroupManager.isSummaryOfGroup(mStatusBarNotification)) {
mGroupExpansionChanging = true;
final boolean wasExpanded = mGroupManager.isGroupExpanded(mStatusBarNotification); final boolean wasExpanded = mGroupManager.isGroupExpanded(mStatusBarNotification);
boolean nowExpanded = mGroupManager.toggleGroupExpansion(mStatusBarNotification); boolean nowExpanded = mGroupManager.toggleGroupExpansion(mStatusBarNotification);
mOnExpandClickListener.onExpandClicked(mEntry, nowExpanded); mOnExpandClickListener.onExpandClicked(mEntry, nowExpanded);
mGroupExpansionChanging = true;
updateBackgroundForGroupState();
MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTIFICATION_GROUP_EXPANDER, MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTIFICATION_GROUP_EXPANDER,
nowExpanded); nowExpanded);
logExpansionEvent(true /* userAction */, wasExpanded); logExpansionEvent(true /* userAction */, wasExpanded);
@@ -1343,6 +1342,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
if (mChildrenContainer != null) { if (mChildrenContainer != null) {
mChildrenContainer.setChildrenExpanded(expanded); mChildrenContainer.setChildrenExpanded(expanded);
} }
updateBackgroundForGroupState();
updateClickAndFocus(); updateClickAndFocus();
} }