Merge "Don't assume device has on screen nav bar in RoundedCorners service." into oc-dr1-dev

am: d20db5a0bd

Change-Id: Idf9600ba1aa8de0a43f146425afdc9485391c12d
This commit is contained in:
Zak Cohen
2017-06-27 15:54:51 +00:00
committed by android-build-merger

View File

@@ -98,9 +98,13 @@ public class RoundedCorners extends SystemUI implements Tunable {
TunablePadding.addTunablePadding(statusBar.findViewById(R.id.keyguard_header), PADDING,
padding, FLAG_END);
FragmentHostManager.get(sb.getNavigationBarWindow()).addTagListener(
View navigationBarWindow = sb.getNavigationBarWindow();
// Not all devices have on screen navigation bars.
if (navigationBarWindow != null) {
FragmentHostManager.get(navigationBarWindow).addTagListener(
NavigationBarFragment.TAG,
new TunablePaddingTagListener(padding, 0));
}
FragmentHostManager fragmentHostManager = FragmentHostManager.get(statusBar);
fragmentHostManager.addTagListener(CollapsedStatusBarFragment.TAG,