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

Commit fbc8a0f2 authored by Brad Stenning's avatar Brad Stenning
Browse files

Clean up some CarSystemUI theme elements 

Also fixed the left and right nav notifications id in case someone one demos them later

Test: Manual
Bug: 119311195
Change-Id: I9a6c31d25a8eb6f6e895180c4946c14629bd668e
(cherry picked from commit 5a4a0f4bfa2ae6aabf9c86da1d59c4d72b2baecd)
parent 33f7f311

packages/CarSystemUI/res/layout/car_fullscreen_user_pod.xml

+5 −3
Original line number Diff line number Diff line
@@ -25,13 +25,15 @@ 
    android:orientation="vertical"

    android:gravity="center">



    <ImageView android:id="@+id/user_avatar"

    <ImageView

        android:id="@+id/user_avatar"

        android:layout_width="@dimen/car_user_switcher_image_avatar_size"

        android:layout_height="@dimen/car_user_switcher_image_avatar_size"

        android:background="@drawable/car_button_ripple_background_light"

        android:background="?android:attr/selectableItemBackground"

        android:gravity="center"/>



    <TextView android:id="@+id/user_name"

    <TextView

        android:id="@+id/user_name"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="@dimen/car_user_switcher_vertical_spacing_between_name_and_avatar"

packages/CarSystemUI/res/layout/car_fullscreen_user_switcher.xml

+1 −3
Original line number Diff line number Diff line
@@ -19,12 +19,10 @@ 
        android:fitsSystemWindows="true"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@color/car_user_switcher_background_color"

        android:visibility="gone">



    <LinearLayout

        android:id="@+id/container"

        android:background="@color/car_user_switcher_background_color"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">
@@ -38,7 +36,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_marginTop="@dimen/car_user_switcher_margin_top"

            android:theme="@style/Theme.Car.Light.List"

            android:theme="@style/PagedListTheme"

            app:verticallyCenterListContent="true"

            app:showPagedListViewDivider="false"

            app:gutter="both"

packages/CarSystemUI/res/layout/car_left_navigation_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
        android:orientation="vertical">



        <com.android.keyguard.AlphaOptimizedImageButton

            android:id="@+id/notifications"

            android:id="@+id/note"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:src="@drawable/car_ic_notification"

packages/CarSystemUI/res/layout/car_navigation_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@android:color/black"

    android:background="@drawable/system_bar_background"

    android:orientation="vertical">

    <LinearLayout

        android:id="@id/nav_buttons"

packages/CarSystemUI/res/layout/car_navigation_bar_unprovisioned.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@android:color/black"

    android:background="@drawable/system_bar_background"

    android:orientation="vertical">



    <LinearLayout