Merge "AOD: Fix in-place ambient layout updates"

This commit is contained in:
Adrian Roos
2017-02-01 20:02:08 +00:00
committed by Android (Google) Code Review
2 changed files with 9 additions and 0 deletions

View File

@@ -121,6 +121,10 @@ public class NotificationData {
return row.getPublicLayout().getContractedChild();
}
public View getAmbientContentView() {
return row.getPrivateLayout().getAmbientChild();
}
public boolean cacheContentViews(Context ctx, Notification updatedNotification,
boolean isLowPriority) {
boolean applyInPlace = false;

View File

@@ -7048,6 +7048,7 @@ public class StatusBar extends SystemUI implements DemoMode,
final RemoteViews bigContentView = entry.cachedBigContentView;
final RemoteViews headsUpContentView = entry.cachedHeadsUpContentView;
final RemoteViews publicContentView = entry.cachedPublicContentView;
final RemoteViews ambientContentView = entry.cachedAmbientContentView;
// Reapply the RemoteViews
contentView.reapply(mContext, entry.getContentView(), mOnClickHandler);
@@ -7065,6 +7066,10 @@ public class StatusBar extends SystemUI implements DemoMode,
publicContentView.reapply(sbn.getPackageContext(mContext),
entry.getPublicContentView(), mOnClickHandler);
}
if (ambientContentView != null && entry.getAmbientContentView() != null) {
ambientContentView.reapply(sbn.getPackageContext(mContext),
entry.getAmbientContentView(), mOnClickHandler);
}
// update the contentIntent
mNotificationClicker.register(entry.row, sbn);