Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Changed NotificationViewController to be enabled when car service is ready." into qt-qpr1-dev

Browse Source
This commit is contained in:
Jian-Yang Liu
2019-11-18 20:26:32 +00:00
committed by Android (Google) Code Review
parent 0537bd334d f7f1f79728
commit 17eb45ab54
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
View File

@@ -544,17 +544,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
CarNotificationListener carNotificationListener = new CarNotificationListener(); CarNotificationListener carNotificationListener = new CarNotificationListener();
mCarUxRestrictionManagerWrapper = new CarUxRestrictionManagerWrapper(); mCarUxRestrictionManagerWrapper = new CarUxRestrictionManagerWrapper();
((CarSystemUIFactory) SystemUIFactory.getInstance()).getCarServiceProvider(mContext)
.addListener((car, ready) -> {
if (!ready) {
return;
}
CarUxRestrictionsManager carUxRestrictionsManager =
(CarUxRestrictionsManager)
car.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE);
mCarUxRestrictionManagerWrapper.setCarUxRestrictionsManager(
carUxRestrictionsManager);
});
mNotificationDataManager = new NotificationDataManager(); mNotificationDataManager = new NotificationDataManager();
mNotificationDataManager.setOnUnseenCountUpdateListener( mNotificationDataManager.setOnUnseenCountUpdateListener(
@@ -678,6 +667,16 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
return handled || isTracking; return handled || isTracking;
} }
}); });
((CarSystemUIFactory) SystemUIFactory.getInstance()).getCarServiceProvider(mContext)
.addListener((car, ready) -> {
if (!ready) {
return;
}
CarUxRestrictionsManager carUxRestrictionsManager =
(CarUxRestrictionsManager)
car.getCarManager(Car.CAR_UX_RESTRICTION_SERVICE);
mCarUxRestrictionManagerWrapper.setCarUxRestrictionsManager(
carUxRestrictionsManager);
mNotificationViewController = new NotificationViewController( mNotificationViewController = new NotificationViewController(
mNotificationView, mNotificationView,
@@ -686,6 +685,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
mCarUxRestrictionManagerWrapper, mCarUxRestrictionManagerWrapper,
mNotificationDataManager); mNotificationDataManager);
mNotificationViewController.enable(); mNotificationViewController.enable();
});
} }
/** /**