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

Commit 5e4576e7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "UI was being created before the provisioned stated was checked."

parents 3e4cc422 eb6051c7

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() {