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

Commit 5a3e17d1 authored by Danny Epstein's avatar Danny Epstein
Browse files

Add rotary support to the nav bar and HUN. 

Add a FocusParkingView to the navigation bar and the heads-up
notification window. Add a dependency on the Chassis UI library.
Make the nav buttons have a blue background, or whatever color
the OEM specifies for the focus highlight.

Test: atest com.android.systemui.car.navigationbar.CarNavigationButtonTest
Bug: 155681517
Change-Id: Ia33c7692554c15427e429ecdba3bc978224ff129
parent cc193758

packages/CarSystemUI/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ android_library { 
        "SystemUIPluginLib",

        "SystemUISharedLib",

        "SettingsLib",

        "car-ui-lib",

        "android.car.userlib",

        "androidx.legacy_legacy-support-v4",

        "androidx.recyclerview_recyclerview",
@@ -95,6 +96,7 @@ android_library { 
        "androidx.slice_slice-builders",

        "androidx.arch.core_core-runtime",

        "androidx.lifecycle_lifecycle-extensions",

        "car-ui-lib",

        "SystemUI-tags",

        "SystemUI-proto",

        "metrics-helper-lib",

packages/CarSystemUI/res/drawable/nav_button_background.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



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

    android:color="@color/nav_bar_ripple_background_color">

    <item android:id="@android:id/mask">

        <shape android:shape="rectangle">

            <solid android:color="?android:colorAccent"/>

            <corners android:radius="6dp"/>

        </shape>

    </item>

</ripple>

packages/CarSystemUI/res/layout/car_left_navigation_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
        android:gravity="bottom"

        android:orientation="vertical">



        <com.android.keyguard.AlphaOptimizedImageButton

        <com.android.systemui.statusbar.AlphaOptimizedImageView

            android:id="@+id/note"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

packages/CarSystemUI/res/layout/car_navigation_button.xml

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
        android:animateLayoutChanges="true"

        android:orientation="vertical">



        <com.android.keyguard.AlphaOptimizedImageButton

        <com.android.systemui.statusbar.AlphaOptimizedImageView

            android:id="@+id/car_nav_button_icon_image"

            android:layout_height="@dimen/car_navigation_button_icon_height"

            android:layout_width="match_parent"
@@ -40,7 +40,7 @@ 
            android:clickable="false"

        />



        <com.android.keyguard.AlphaOptimizedImageButton

        <com.android.systemui.statusbar.AlphaOptimizedImageView

            android:id="@+id/car_nav_button_more_icon"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

packages/CarSystemUI/res/layout/car_right_navigation_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
        android:gravity="bottom"

        android:orientation="vertical">



        <com.android.keyguard.AlphaOptimizedImageButton

        <com.android.systemui.statusbar.AlphaOptimizedImageView

            android:id="@+id/note"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"