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

Commit 98d04627 authored by Yabin Huang's avatar Yabin Huang Committed by Automerger Merge Worker
Browse files

Merge "Update the style of navigation button" into rvc-dev am: b5ec9c4d 

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

Change-Id: I3cd9c3717600e106dfffbdd928093d4a3dcf41f7
parents eb688524 b5ec9c4d

packages/CarSystemUI/res/values/colors.xml

+0 −1
Original line number Diff line number Diff line
@@ -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>

packages/CarSystemUI/res/values/styles.xml

+1 −5
Original line number Diff line number Diff line
@@ -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