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

Commit 48426d59 authored by Victor Chan's avatar Victor Chan Committed by Android (Google) Code Review
Browse files

Merge "Fix crash in car system ui."

parents 598d8eaf ecdb8b0e

packages/SystemUI/src/com/android/systemui/statusbar/car/CarNavigationBarView.java

+7 −0
Original line number Diff line number Diff line
@@ -149,4 +149,11 @@ class CarNavigationBarView extends NavigationBarView { 
    public View getCurrentView() {

        return this;

    }



    @Override

    public void setNavigationIconHints(int hints, boolean force) {

        // We do not need to set the navigation icon hints for a vehicle

        // Calling setNavigationIconHints in the base class will result in a NPE as the car

        // navigation bar does not have a back button.

    }

}

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

+6 −0
Original line number Diff line number Diff line
@@ -57,4 +57,10 @@ public class CarStatusBar extends PhoneStatusBar { 
        carNavBar.setActivityStarter(this);

        mNavigationBarView = carNavBar;

    }



    @Override

    protected void repositionNavigationBar() {

        // The navigation bar for a vehicle will not need to be repositioned, as it is always

        // set at the bottom.

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+1 −1
Original line number Diff line number Diff line
@@ -1202,7 +1202,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        mWindowManager.addView(mNavigationBarView, getNavigationBarLayoutParams());

    }



    private void repositionNavigationBar() {

    protected void repositionNavigationBar() {

        if (mNavigationBarView == null || !mNavigationBarView.isAttachedToWindow()) return;



        prepareNavigationBarView();