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

Commit a45febf1 authored by Zak Cohen's avatar Zak Cohen Committed by android-build-merger
Browse files

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

am: d20db5a0

Change-Id: Idf9600ba1aa8de0a43f146425afdc9485391c12d
parents 89244a76 d20db5a0
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -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,