Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update the style of navigation button" into rvc-dev am: b5ec9c4d67 am: 98d04627e4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818599

Change-Id: Id556b56369fa69202ac42e89df6f37d961629092
This commit is contained in:
Yabin Huang
2020-06-11 19:28:55 +00:00
committed by Automerger Merge Worker
parent a23005e3b4 98d04627e4
commit 576da2742c
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/CarSystemUI/res/values/colors.xml
View File

@@ -15,7 +15,6 @@
~ limitations under the License ~ limitations under the License
--> -->
<resources xmlns:android="http://schemas.android.com/apk/res/android"> <resources xmlns:android="http://schemas.android.com/apk/res/android">
<color name="nav_bar_ripple_background_color">#40ffffff</color>
<!-- colors for user switcher --> <!-- colors for user switcher -->
<color name="car_user_switcher_background_color">#000000</color> <color name="car_user_switcher_background_color">#000000</color>
<color name="car_user_switcher_name_text_color">@*android:color/car_body1_light</color> <color name="car_user_switcher_name_text_color">@*android:color/car_body1_light</color>

6
packages/CarSystemUI/res/values/styles.xml
View File

@@ -37,13 +37,9 @@
<item name="android:textColor">@*android:color/car_grey_50</item> <item name="android:textColor">@*android:color/car_grey_50</item>
</style> </style>
<style name="CarNavigationBarButtonTheme">
<item name="android:colorControlHighlight">@color/nav_bar_ripple_background_color</item>
</style>
<style name="NavigationBarButton"> <style name="NavigationBarButton">
<item name="android:layout_height">96dp</item> <item name="android:layout_height">96dp</item>
<item name="android:layout_width">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> </style>
</resources> </resources>