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

Commit e907b48c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move navigation bar, windows, and statusbar related classes" into... 

Merge "Move navigation bar, windows, and statusbar related classes" into rvc-dev am: d8736aac am: 447de5da am: 1d8f5d7f

Change-Id: I7442ac152f6bae8d64cc866ed0afd3f944e05358
parents c3102335 1d8f5d7f

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.navigationbar.car.CarNavigationBarView

<com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationButton

        <com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationButton

        <com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationButton

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

            android:id="@+id/hvac"

            android:layout_height="wrap_content"

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


    </LinearLayout>



</com.android.systemui.navigationbar.car.CarNavigationBarView>
 
</com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationBarView

<com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationButton

        <com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationButton

        <com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationBarView>
 
</com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationBarView

<com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationButton

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

            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.navigationbar.car.CarNavigationButton

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

            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.navigationbar.car.CarNavigationButton

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

            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.navigationbar.car.CarNavigationButton

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

            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.navigationbar.car.CarNavigationButton

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

            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.navigationbar.car.CarNavigationButton

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

            android:id="@+id/notifications"

            style="@style/NavigationBarButton"

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

            android:layout_weight="1"/>



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

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

            android:id="@+id/assist"

            style="@style/NavigationBarButton"

            systemui:icon="@drawable/ic_mic_white"
@@ -140,4 +140,4 @@ 
        android:visibility="gone"

    />



</com.android.systemui.navigationbar.car.CarNavigationBarView>
 
 No newline at end of file
 
</com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationBarView

<com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationButton

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

            android:id="@+id/home"

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

            android:layout_height="match_parent"
@@ -42,5 +42,5 @@ 
            systemui:highlightWhenSelected="true"

        />

    </LinearLayout>

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

</com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationBarView

<com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationButton

        <com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationButton

        <com.android.systemui.car.navigationbar.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.navigationbar.car.CarNavigationButton

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

            android:id="@+id/hvac"

            android:layout_height="wrap_content"

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


    </LinearLayout>



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