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

Commit 1cd79f31 authored by Julia Kawano's avatar Julia Kawano Committed by Android (Google) Code Review
Browse files

Merge "Remove redundant icons and temp controls from nav bar"

parents b8ae5511 cecf4cc2

packages/CarSystemUI/res/layout/car_navigation_bar.xml

+10 −35
Original line number Diff line number Diff line
@@ -30,14 +30,6 @@ 
        android:layout_height="wrap_content"

        android:layoutDirection="ltr">



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

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_alignParentStart="true"

            android:background="@null"

            systemui:broadcast="true"

            systemui:intent="intent:#Intent;action=android.car.intent.action.TOGGLE_HVAC_CONTROLS;end">



        <com.android.systemui.car.hvac.AdjustableTemperatureView

            android:id="@+id/driver_hvac"

            android:layout_width="wrap_content"
@@ -45,7 +37,6 @@ 
            android:gravity="center_vertical"

            systemui:hvacAreaId="49"

            systemui:hvacTempFormat="%.0f\u00B0" />

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



        <LinearLayout

            android:layout_width="wrap_content"
@@ -101,27 +92,12 @@ 
                systemui:icon="@drawable/car_ic_notification"

                systemui:longIntent="intent:#Intent;component=com.android.car.bugreport/.BugReportActivity;end"/>



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

                android:id="@+id/assist"

                style="@style/NavigationBarButton"

                systemui:highlightWhenSelected="true"

                systemui:icon="@drawable/ic_mic_white"

                systemui:useDefaultAppIconForRole="true"/>



            <Space

                android:layout_width="0dp"

                android:layout_height="match_parent"

                android:layout_weight="1"/>

        </LinearLayout>



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

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_alignParentEnd="true"

            android:background="@null"

            systemui:broadcast="true"

            systemui:intent="intent:#Intent;action=android.car.intent.action.TOGGLE_HVAC_CONTROLS;end">



        <com.android.systemui.car.hvac.AdjustableTemperatureView

            android:id="@+id/passenger_hvac"

            android:layout_width="wrap_content"
@@ -130,7 +106,6 @@ 
            android:gravity="center_vertical"

            systemui:hvacAreaId="68"

            systemui:hvacTempFormat="%.0f\u00B0" />

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

    </RelativeLayout>



    <LinearLayout