Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c297b344 authored by Adora Zhang's avatar Adora Zhang Committed by android-build-merger
Browse files

Merge "Reset notification list upon opening the drawer." into qt-dev am: e7180555

am: 1022068e

Change-Id: I4d3ec820c6aa3fb3e120aeec2c01a93cbe435f80
parents 9de85f49 1022068e
Loading
Loading
Loading
Loading
+5 −1
Original line number Original line Diff line number Diff line
@@ -131,6 +131,8 @@ public class CarStatusBar extends StatusBar implements
    // The container for the notifications.
    // The container for the notifications.
    private CarNotificationView mNotificationView;
    private CarNotificationView mNotificationView;
    private RecyclerView mNotificationList;
    private RecyclerView mNotificationList;
    // The controller for the notification view.
    private NotificationViewController mNotificationViewController;
    // The state of if the notification list is currently showing the bottom.
    // The state of if the notification list is currently showing the bottom.
    private boolean mNotificationListAtBottom;
    private boolean mNotificationListAtBottom;
    // Was the notification list at the bottom when the user first touched the screen
    // Was the notification list at the bottom when the user first touched the screen
@@ -544,7 +546,7 @@ public class CarStatusBar extends StatusBar implements
            }
            }
        });
        });


        NotificationViewController mNotificationViewController = new NotificationViewController(
        mNotificationViewController = new NotificationViewController(
                mNotificationView,
                mNotificationView,
                PreprocessingManager.getInstance(mContext),
                PreprocessingManager.getInstance(mContext),
                carNotificationListener,
                carNotificationListener,
@@ -651,9 +653,11 @@ public class CarStatusBar extends StatusBar implements
                    mStatusBarWindowController.setPanelVisible(false);
                    mStatusBarWindowController.setPanelVisible(false);
                    mNotificationView.setVisibility(View.INVISIBLE);
                    mNotificationView.setVisibility(View.INVISIBLE);
                    mNotificationList.setClipBounds(null);
                    mNotificationList.setClipBounds(null);
                    mNotificationViewController.setIsInForeground(false);
                    // let the status bar know that the panel is closed
                    // let the status bar know that the panel is closed
                    setPanelExpanded(false);
                    setPanelExpanded(false);
                } else {
                } else {
                    mNotificationViewController.setIsInForeground(true);
                    // let the status bar know that the panel is open
                    // let the status bar know that the panel is open
                    mNotificationView.setVisibleNotificationsAsSeen();
                    mNotificationView.setVisibleNotificationsAsSeen();
                    setPanelExpanded(true);
                    setPanelExpanded(true);