Merge "Changed NotificationViewController to be enabled when car service is... (17eb45ab) · Commits · e / os / android_frameworks_base

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

+18 −18

Original line number	Diff line number	Diff line
		@@ -544,17 +544,6 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt

		CarNotificationListener carNotificationListener = new CarNotificationListener();
		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.setOnUnseenCountUpdateListener(
		@@ -678,6 +667,16 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		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(
		mNotificationView,
		@@ -686,6 +685,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
		mCarUxRestrictionManagerWrapper,
		mNotificationDataManager);
		mNotificationViewController.enable();
		});
		}

		/**