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

Commit bde54603 authored by Danny Epstein's avatar Danny Epstein Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Use round highlight for navigation buttons am: 9242e6ee 

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

Change-Id: I7ce18b3de04b37e796c0790a9b9a3594bbdcf05b
parents 39427489 9242e6ee

packages/CarSystemUI/res/drawable/navigation_bar_button_bg.xml

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

<!--

  ~ Copyright (C) 2020 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.

  -->

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

    <item android:state_focused="true">

        <shape android:shape="oval">

            <solid android:color="@color/car_ui_rotary_focus_fill_color"/>

            <stroke android:width="@dimen/car_ui_rotary_focus_stroke_width"

                    android:color="@color/car_ui_rotary_focus_stroke_color"/>

        </shape>

    </item>

    <item>

        <ripple android:color="@color/car_ui_ripple_color">

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

                <shape android:shape="oval">

                    <solid android:color="@android:color/white"/>

                </shape>

            </item>

        </ripple>

    </item>

</selector>

packages/CarSystemUI/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,6 +40,6 @@ 
    <style name="NavigationBarButton">

        <item name="android:layout_height">96dp</item>

        <item name="android:layout_width">96dp</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

        <item name="android:background">@drawable/navigation_bar_button_bg</item>

    </style>

</resources>
 
 No newline at end of file

packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationButton.java

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ public class CarNavigationButton extends LinearLayout { 
        if (mHighlightWhenSelected) {

            // Always apply selected alpha if the button does not toggle alpha based on selection

            // state.

            setAlpha(!mHighlightWhenSelected || mSelected ? mSelectedAlpha : mUnselectedAlpha);

            mIcon.setAlpha(

                    !mHighlightWhenSelected || mSelected ? mSelectedAlpha : mUnselectedAlpha);

        }

        if (mShowMoreWhenSelected && mMoreIcon != null) {

            mMoreIcon.setVisibility(selected ? VISIBLE : GONE);