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

Commit eb6051c7 authored by Brad Stenning's avatar Brad Stenning
Browse files

UI was being created before the provisioned stated was checked. 

Test: manual
Change-Id: Ide19ed44610524d53d2336060fda3193238919b0
(cherry picked from commit 590936fe54af7a1b4746cff3f7a6f317480147ab)
parent d5276e9f

packages/CarSystemUI/res/drawable/car_ic_selection_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:viewportHeight="70.0"

    android:viewportWidth="70.0">

    <path

        android:fillColor="@color/car_accent"

        android:fillColor="?android:attr/colorAccent"

        android:fillType="evenOdd"

        android:pathData="M4,0L66,0A4,4 0,0 1,70 4L70,66A4,4 0,0 1,66 70L4,70A4,4 0,0 1,0 66L0,4A4,4 0,0 1,4 0z"

        android:strokeColor="#00000000"

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

+4 −2
Original line number Diff line number Diff line
@@ -92,6 +92,10 @@ public class CarStatusBar extends StatusBar implements 


    @Override

    public void start() {

        // get the provisioned state before calling the parent class since it's that flow that

        // builds the nav bar

        mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class);

        mDeviceIsProvisioned = mDeviceProvisionedController.isDeviceProvisioned();

        super.start();

        mTaskStackListener = new TaskStackListenerImpl();

        mActivityManagerWrapper = ActivityManagerWrapper.getInstance();
@@ -105,8 +109,6 @@ public class CarStatusBar extends StatusBar implements 
        mHvacController.connectToCarService();



        CarSystemUIFactory factory = SystemUIFactory.getInstance();

        mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class);

        mDeviceIsProvisioned = mDeviceProvisionedController.isDeviceProvisioned();

        if (!mDeviceIsProvisioned) {

            mDeviceProvisionedController.addCallback(

                    new DeviceProvisionedController.DeviceProvisionedListener() {