Merge "Rounded ripple notification history snoozed list" into sc-dev am: 1e747a593f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14735820

Change-Id: Ic555a2748a97b1ffe3f99101416d31e1de264c5a
This commit is contained in:
TreeHugger Robot
2021-05-26 18:49:38 +00:00
committed by Automerger Merge Worker

View File

@@ -156,6 +156,7 @@ public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity {
View recyclerView = mTodayView.findViewById(R.id.apps); View recyclerView = mTodayView.findViewById(R.id.apps);
recyclerView.setClipToOutline(true); recyclerView.setClipToOutline(true);
mTodayView.setOutlineProvider(mOutlineProvider); mTodayView.setOutlineProvider(mOutlineProvider);
mSnoozeView.setOutlineProvider(mOutlineProvider);
// for each package, new header and recycler view // for each package, new header and recycler view
for (int i = 0, notificationsSize = notifications.size(); i < notificationsSize; i++) { for (int i = 0, notificationsSize = notifications.size(); i < notificationsSize; i++) {
NotificationHistoryPackage nhp = notifications.get(i); NotificationHistoryPackage nhp = notifications.get(i);
@@ -219,6 +220,11 @@ public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity {
} }
}; };
private void configureNotificationList(View recyclerView) {
recyclerView.setClipToOutline(true);
recyclerView.setOutlineProvider(mOutlineProvider);
}
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -227,9 +233,8 @@ public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity {
mTodayView = findViewById(R.id.apps); mTodayView = findViewById(R.id.apps);
mSnoozeView = findViewById(R.id.snoozed_list); mSnoozeView = findViewById(R.id.snoozed_list);
mDismissView = findViewById(R.id.recently_dismissed_list); mDismissView = findViewById(R.id.recently_dismissed_list);
View recyclerView = mDismissView.findViewById(R.id.notification_list); configureNotificationList(mDismissView.findViewById(R.id.notification_list));
recyclerView.setClipToOutline(true); configureNotificationList(mSnoozeView.findViewById(R.id.notification_list));
recyclerView.setOutlineProvider(mOutlineProvider);
mHistoryOff = findViewById(R.id.history_off); mHistoryOff = findViewById(R.id.history_off);
mHistoryOn = findViewById(R.id.history_on); mHistoryOn = findViewById(R.id.history_on);
mHistoryEmpty = findViewById(R.id.history_on_empty); mHistoryEmpty = findViewById(R.id.history_on_empty);