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

Commit cecf4cc2 authored by Julia Kawano's avatar Julia Kawano
Browse files

Remove redundant icons and temp controls from nav bar 

- Remove assistant icon from nav bar (assistant widget now visible on
home screen)
- Remove tapping temperature views opens HVAC controls. HVAC controls
are accessible via the HVAC nav button

Bug: 169043149
Test: manual - built on flame_car
Change-Id: I6f437560bc9fd040d5a44a27902c9f579125bac9
parent 3f6d3707

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