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

Commit 1a39dea8 authored by Heemin Seog's avatar Heemin Seog
Browse files

Separate navigation bar 

Move the logic related to navigation bar out of CarStatusBar into
StatusBar.

Note that some navigation bar logic related to notifications and
keyguard needs to stay in StatusBar for now. Will be refactored out in
separate CLs.

Bug: 142787842
Test: manual
Change-Id: Ie6bc5bccbc30aa53ea15e3f2ce19fd793bd6b38a
parent f8b573a8

packages/CarSystemUI/res/layout/car_left_navigation_bar.xml

+5 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
*/

-->



<com.android.systemui.statusbar.car.CarNavigationBarView

<com.android.systemui.navigationbar.car.CarNavigationBarView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:layout_height="match_parent"
@@ -36,7 +36,7 @@ 
        android:background="@drawable/system_bar_background"

        android:animateLayoutChanges="true">



        <com.android.systemui.statusbar.car.CarNavigationButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/home"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"
@@ -47,7 +47,7 @@ 
            android:paddingBottom="30dp"

        />



        <com.android.systemui.statusbar.car.CarNavigationButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/grid"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"
@@ -59,7 +59,7 @@ 
            android:paddingBottom="30dp"

        />



        <com.android.systemui.statusbar.car.CarNavigationButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/hvac"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"
@@ -110,4 +110,4 @@ 


    </LinearLayout>



</com.android.systemui.statusbar.car.CarNavigationBarView>
 
</com.android.systemui.navigationbar.car.CarNavigationBarView>

packages/CarSystemUI/res/layout/car_left_navigation_bar_unprovisioned.xml

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
*/

-->



<com.android.systemui.statusbar.car.CarNavigationBarView

<com.android.systemui.navigationbar.car.CarNavigationBarView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:layout_height="match_parent"
@@ -36,7 +36,7 @@ 
        android:background="@drawable/system_bar_background"

        android:animateLayoutChanges="true">



        <com.android.systemui.statusbar.car.CarNavigationButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/home"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"
@@ -47,7 +47,7 @@ 
            android:paddingBottom="30dp"

        />



        <com.android.systemui.statusbar.car.CarNavigationButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/hvac"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"
@@ -59,4 +59,4 @@ 
            android:paddingBottom="30dp"

        />

    </LinearLayout>

</com.android.systemui.statusbar.car.CarNavigationBarView>
 
</com.android.systemui.navigationbar.car.CarNavigationBarView>

packages/CarSystemUI/res/layout/car_navigation_bar.xml

+9 −9
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  ~ limitations under the License

  -->



<com.android.systemui.statusbar.car.CarNavigationBarView

<com.android.systemui.navigationbar.car.CarNavigationBarView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"
@@ -33,7 +33,7 @@ 
        android:paddingEnd="20dp"

        android:gravity="center">



        <com.android.systemui.statusbar.car.CarFacetButton

        <com.android.systemui.navigationbar.car.CarFacetButton

            android:id="@+id/home"

            style="@style/NavigationBarButton"

            systemui:componentNames="com.android.car.carlauncher/.CarLauncher"
@@ -48,7 +48,7 @@ 
            android:layout_height="match_parent"

            android:layout_weight="1"/>



        <com.android.systemui.statusbar.car.CarFacetButton

        <com.android.systemui.navigationbar.car.CarFacetButton

            android:id="@+id/maps_nav"

            style="@style/NavigationBarButton"

            systemui:categories="android.intent.category.APP_MAPS"
@@ -63,7 +63,7 @@ 
            android:layout_height="match_parent"

            android:layout_weight="1"/>



        <com.android.systemui.statusbar.car.CarFacetButton

        <com.android.systemui.navigationbar.car.CarFacetButton

            android:id="@+id/music_nav"

            style="@style/NavigationBarButton"

            systemui:categories="android.intent.category.APP_MUSIC"
@@ -79,7 +79,7 @@ 
            android:layout_height="match_parent"

            android:layout_weight="1"/>



        <com.android.systemui.statusbar.car.CarFacetButton

        <com.android.systemui.navigationbar.car.CarFacetButton

            android:id="@+id/phone_nav"

            style="@style/NavigationBarButton"

            systemui:icon="@drawable/car_ic_phone"
@@ -94,7 +94,7 @@ 
            android:layout_height="match_parent"

            android:layout_weight="1"/>



        <com.android.systemui.statusbar.car.CarFacetButton

        <com.android.systemui.navigationbar.car.CarFacetButton

            android:id="@+id/grid_nav"

            style="@style/NavigationBarButton"

            systemui:componentNames="com.android.car.carlauncher/.AppGridActivity"
@@ -109,7 +109,7 @@ 
            android:layout_height="match_parent"

            android:layout_weight="1"/>



        <com.android.systemui.statusbar.car.CarNavigationButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/notifications"

            style="@style/NavigationBarButton"

            systemui:icon="@drawable/car_ic_notification"
@@ -123,7 +123,7 @@ 
            android:layout_height="match_parent"

            android:layout_weight="1"/>



        <com.android.systemui.statusbar.car.AssitantButton

        <com.android.systemui.navigationbar.car.AssitantButton

            android:id="@+id/assist"

            style="@style/NavigationBarButton"

            systemui:icon="@drawable/ic_mic_white"
@@ -144,4 +144,4 @@ 


    </LinearLayout>



</com.android.systemui.statusbar.car.CarNavigationBarView>
 
 No newline at end of file
 
</com.android.systemui.navigationbar.car.CarNavigationBarView>
 
 No newline at end of file

packages/CarSystemUI/res/layout/car_navigation_bar_unprovisioned.xml

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  ~ limitations under the License

  -->



<com.android.systemui.statusbar.car.CarNavigationBarView

<com.android.systemui.navigationbar.car.CarNavigationBarView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"
@@ -31,7 +31,7 @@ 
        android:paddingStart="@*android:dimen/car_padding_5"

        android:paddingEnd="@*android:dimen/car_padding_5">



        <com.android.systemui.statusbar.car.CarNavigationButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/home"

            android:layout_width="@*android:dimen/car_touch_target_size"

            android:layout_height="match_parent"
@@ -40,5 +40,5 @@ 
            systemui:intent="intent:#Intent;action=android.intent.action.MAIN;category=android.intent.category.HOME;launchFlags=0x14000000;end"

        />

    </LinearLayout>

</com.android.systemui.statusbar.car.CarNavigationBarView>

</com.android.systemui.navigationbar.car.CarNavigationBarView>

packages/CarSystemUI/res/layout/car_right_navigation_bar.xml

+5 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
*/

-->



<com.android.systemui.statusbar.car.CarNavigationBarView

<com.android.systemui.navigationbar.car.CarNavigationBarView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:layout_height="match_parent"
@@ -39,7 +39,7 @@ 
        android:background="@drawable/system_bar_background"

        android:animateLayoutChanges="true">



        <com.android.systemui.statusbar.car.CarNavigationButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/home"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"
@@ -50,7 +50,7 @@ 
            android:paddingBottom="30dp"

        />



        <com.android.systemui.statusbar.car.CarNavigationButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/grid"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"
@@ -62,7 +62,7 @@ 
            android:paddingBottom="30dp"

        />



        <com.android.systemui.statusbar.car.CarNavigationButton

        <com.android.systemui.navigationbar.car.CarNavigationButton

            android:id="@+id/hvac"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"
@@ -113,4 +113,4 @@ 


    </LinearLayout>



</com.android.systemui.statusbar.car.CarNavigationBarView>
 
</com.android.systemui.navigationbar.car.CarNavigationBarView>