From a0d6c87323710d013499726278529f6a2fd24c99 Mon Sep 17 00:00:00 2001
From: Yabin Huang <yabinh@google.com>
Date: Tue, 9 Jun 2020 19:59:07 -0700
Subject: [PATCH] Update the style of navigation button

Make navigation button use ?android:attr/selectableItemBackground as
background, and remove unused style CarNavigationBarButtonTheme.

Bug: 155681517
Test: manual
Change-Id: I637e7a49bb68145c5c36cf1b0363113437b88212
---
 packages/CarSystemUI/res/values/colors.xml | 1 -
 packages/CarSystemUI/res/values/styles.xml | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/CarSystemUI/res/values/colors.xml b/packages/CarSystemUI/res/values/colors.xml
index d20ab49a22e61..ab94265935359 100644
--- a/packages/CarSystemUI/res/values/colors.xml
+++ b/packages/CarSystemUI/res/values/colors.xml
@@ -15,7 +15,6 @@
   ~ limitations under the License
   -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <color name="nav_bar_ripple_background_color">#40ffffff</color>
     <!-- colors for user switcher -->
     <color name="car_user_switcher_background_color">#000000</color>
     <color name="car_user_switcher_name_text_color">@*android:color/car_body1_light</color>
diff --git a/packages/CarSystemUI/res/values/styles.xml b/packages/CarSystemUI/res/values/styles.xml
index 7fc69e6d5d8f6..e76373d4a4f7b 100644
--- a/packages/CarSystemUI/res/values/styles.xml
+++ b/packages/CarSystemUI/res/values/styles.xml
@@ -37,13 +37,9 @@
         <item name="android:textColor">@*android:color/car_grey_50</item>
     </style>
 
-    <style name="CarNavigationBarButtonTheme">
-        <item name="android:colorControlHighlight">@color/nav_bar_ripple_background_color</item>
-    </style>
-
     <style name="NavigationBarButton">
         <item name="android:layout_height">96dp</item>
         <item name="android:layout_width">96dp</item>
-        <item name="android:background">@*android:drawable/item_background_material</item>
+        <item name="android:background">?android:attr/selectableItemBackground</item>
     </style>
 </resources>
\ No newline at end of file