Merge "Update navigation bar upon change of display density" (affa55b4) · Commits · e / os / android_frameworks_base

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -105,8 +105,6 @@ public class CarStatusBar extends StatusBar implements
		mHvacController.connectToCarService();

		CarSystemUIFactory factory = SystemUIFactory.getInstance();
		mCarFacetButtonController = factory.getCarDependencyComponent()
		.getCarFacetButtonController();
		mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class);
		mDeviceIsProvisioned = mDeviceProvisionedController.isDeviceProvisioned();
		if (!mDeviceIsProvisioned) {
		@@ -137,7 +135,7 @@ public class CarStatusBar extends StatusBar implements

		/**
		* Remove all content from navbars and rebuild them. Used to allow for different nav bars
		* before and after the device is provisioned
		* before and after the device is provisioned. . Also for change of density and font size.
		*/
		private void restartNavBars() {
		// remove and reattach all hvac components such that we don't keep a reference to unused
		@@ -253,6 +251,9 @@ public class CarStatusBar extends StatusBar implements
		super.makeStatusBarView();
		mHvacController = new HvacController(mContext);

		CarSystemUIFactory factory = SystemUIFactory.getInstance();
		mCarFacetButtonController = factory.getCarDependencyComponent()
		.getCarFacetButtonController();
		mNotificationPanelBackground = getDefaultWallpaper();
		mScrimController.setScrimBehindDrawable(mNotificationPanelBackground);

		@@ -589,6 +590,7 @@ public class CarStatusBar extends StatusBar implements
		@Override
		public void onDensityOrFontScaleChanged() {
		super.onDensityOrFontScaleChanged();
		restartNavBars();
		// Need to update the background on density changed in case the change was due to night
		// mode.
		mNotificationPanelBackground = getDefaultWallpaper();