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

Commit a02c99ec authored by JianYang Liu's avatar JianYang Liu Committed by Jian-Yang Liu
Browse files

Fixed CarStatusBar to use Car's implementation of navigation bar. 

Resolves the issue where for Car we switched back to only showing
Phone's implementation of StatusBar rather than Car's.

Bug: 148078465
Test: Manual
Change-Id: Id1b342e3b7a0e9437422c1edd221f320d52927de
parent 3e26863d

packages/CarSystemUI/res/layout/super_notification_shade.xml

+0 −18
Original line number Diff line number Diff line
@@ -59,24 +59,6 @@ 
        sysui:ignoreRightInset="true"

    />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="@dimen/status_bar_height"

        android:orientation="vertical"

    >

        <FrameLayout

            android:id="@+id/status_bar_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:visibility="gone"

        />



        <FrameLayout

            android:id="@+id/car_top_navigation_bar_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

    </LinearLayout>



    <include layout="@layout/brightness_mirror"/>



    <ViewStub android:id="@+id/fullscreen_user_switcher_stub"

packages/CarSystemUI/res/layout/super_status_bar.xml

+16 −3
Original line number Diff line number Diff line
@@ -25,9 +25,22 @@ 
    android:layout_height="match_parent"

    android:fitsSystemWindows="true">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

    >

        <FrameLayout

            android:id="@+id/status_bar_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:visibility="gone"

        />



        <FrameLayout

            android:id="@+id/car_top_navigation_bar_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

    </LinearLayout>



</com.android.systemui.statusbar.phone.StatusBarWindowView>

packages/CarSystemUI/src/com/android/systemui/navigationbar/car/CarNavigationBar.java

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks 


    private void buildNavBarWindows() {

        mTopNavigationBarWindow = mSuperStatusBarViewFactory

                .getNotificationShadeWindowView()

                .getStatusBarWindowView()

                .findViewById(R.id.car_top_navigation_bar_container);

        mBottomNavigationBarWindow = mCarNavigationBarController.getBottomWindow();

        mLeftNavigationBarWindow = mCarNavigationBarController.getLeftWindow();