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

Commit b8d760d3 authored by Jian-Yang Liu's avatar Jian-Yang Liu Committed by android-build-merger
Browse files

Merge "Changed NotificationViewController to be enabled when car service is... 

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

Change-Id: I44b59d35c8afb2be59755f14d0a0a0fa09ab9431
parents f08074d6 17eb45ab

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();

                });

    }



    /**