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

Merge "Update navigation bar upon change of display density"

Browse Source 
am: f46b14b6af

Change-Id: I5c9d6770f8f3343fc41650ec4de2696fada0ee19
This commit is contained in:
rleix
2019-02-06 15:58:11 -08:00
committed by android-build-merger
parent 24a986bfb1 f46b14b6af
commit 87401e095d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
View File

@@ -99,7 +99,6 @@ public class CarStatusBar extends StatusBar implements
Log.d(TAG, "Connecting to HVAC service"); Log.d(TAG, "Connecting to HVAC service");
Dependency.get(HvacController.class).connectToCarService(); Dependency.get(HvacController.class).connectToCarService();
} }
mCarFacetButtonController = Dependency.get(CarFacetButtonController.class);
mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class); mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class);
mDeviceIsProvisioned = mDeviceProvisionedController.isDeviceProvisioned(); mDeviceIsProvisioned = mDeviceProvisionedController.isDeviceProvisioned();
if (!mDeviceIsProvisioned) { if (!mDeviceIsProvisioned) {
@@ -117,7 +116,7 @@ public class CarStatusBar extends StatusBar implements
/** /**
* Remove all content from navbars and rebuild them. Used to allow for different nav bars * 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() { private void restartNavBars() {
mCarFacetButtonController.removeAll(); mCarFacetButtonController.removeAll();
@@ -216,6 +215,7 @@ public class CarStatusBar extends StatusBar implements
protected void makeStatusBarView() { protected void makeStatusBarView() {
super.makeStatusBarView(); super.makeStatusBarView();
mCarFacetButtonController = Dependency.get(CarFacetButtonController.class);
mNotificationPanelBackground = getDefaultWallpaper(); mNotificationPanelBackground = getDefaultWallpaper();
mScrimController.setScrimBehindDrawable(mNotificationPanelBackground); mScrimController.setScrimBehindDrawable(mNotificationPanelBackground);
@@ -513,6 +513,7 @@ public class CarStatusBar extends StatusBar implements
@Override @Override
public void onDensityOrFontScaleChanged() { public void onDensityOrFontScaleChanged() {
super.onDensityOrFontScaleChanged(); super.onDensityOrFontScaleChanged();
restartNavBars();
// Need to update the background on density changed in case the change was due to night // Need to update the background on density changed in case the change was due to night
// mode. // mode.
mNotificationPanelBackground = getDefaultWallpaper(); mNotificationPanelBackground = getDefaultWallpaper();