Merge "Do not set guts visibility to transient state" into qt-qpr1-dev

This commit is contained in:
TreeHugger Robot
2019-08-09 17:52:24 +00:00
committed by Android (Google) Code Review

View File

@@ -1209,12 +1209,12 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
mChildrenContainer.reInflateViews(mExpandClickListener, mEntry.notification); mChildrenContainer.reInflateViews(mExpandClickListener, mEntry.notification);
} }
if (mGuts != null) { if (mGuts != null) {
View oldGuts = mGuts; NotificationGuts oldGuts = mGuts;
int index = indexOfChild(oldGuts); int index = indexOfChild(oldGuts);
removeView(oldGuts); removeView(oldGuts);
mGuts = (NotificationGuts) LayoutInflater.from(mContext).inflate( mGuts = (NotificationGuts) LayoutInflater.from(mContext).inflate(
R.layout.notification_guts, this, false); R.layout.notification_guts, this, false);
mGuts.setVisibility(oldGuts.getVisibility()); mGuts.setVisibility(oldGuts.isExposed() ? VISIBLE : GONE);
addView(mGuts, index); addView(mGuts, index);
} }
View oldMenu = mMenuRow == null ? null : mMenuRow.getMenuView(); View oldMenu = mMenuRow == null ? null : mMenuRow.getMenuView();