Changed NotificationViewController to be enabled when car service is

ready.

Also moved the listener to be added at the end of connectNotificationsUI
when all other variables have been initialized.

Bug: 144583077
Test: Manual
Change-Id: I281fbdd833c23d8dc9d2430d8a6eaad7e4577c53
This commit is contained in:
JianYang Liu
2019-11-15 13:20:35 -08:00
committed by Jian-Yang Liu
parent 0740566355
commit 1d429ee4b8

View File

@@ -560,13 +560,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
}); });
CarNotificationListener carNotificationListener = new CarNotificationListener(); CarNotificationListener carNotificationListener = new CarNotificationListener();
mCarUxRestrictionManagerWrapper = new CarUxRestrictionManagerWrapper(); mCarUxRestrictionManagerWrapper = new CarUxRestrictionManagerWrapper();
mCarServiceProvider.addListener(car -> {
CarUxRestrictionsManager carUxRestrictionsManager =
(CarUxRestrictionsManager)
car.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE);
mCarUxRestrictionManagerWrapper.setCarUxRestrictionsManager(
carUxRestrictionsManager);
});
mNotificationDataManager = new NotificationDataManager(); mNotificationDataManager = new NotificationDataManager();
mNotificationDataManager.setOnUnseenCountUpdateListener( mNotificationDataManager.setOnUnseenCountUpdateListener(
@@ -681,14 +674,21 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
return handled || isTracking; return handled || isTracking;
} }
}); });
mCarServiceProvider.addListener(car -> {
CarUxRestrictionsManager carUxRestrictionsManager =
(CarUxRestrictionsManager)
car.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE);
mCarUxRestrictionManagerWrapper.setCarUxRestrictionsManager(
carUxRestrictionsManager);
mNotificationViewController = new NotificationViewController( mNotificationViewController = new NotificationViewController(
mNotificationView, mNotificationView,
PreprocessingManager.getInstance(mContext), PreprocessingManager.getInstance(mContext),
carNotificationListener, carNotificationListener,
mCarUxRestrictionManagerWrapper, mCarUxRestrictionManagerWrapper,
mNotificationDataManager); mNotificationDataManager);
mNotificationViewController.enable(); mNotificationViewController.enable();
});
} }
/** /**