diff options
| author | Danny Epstein <depstein@google.com> | 2020-12-02 18:30:32 -0800 |
|---|---|---|
| committer | Danny Epstein <depstein@google.com> | 2020-12-03 16:35:13 -0800 |
| commit | 9242e6ee6a029a01635eb482b719dcd4d99fa157 (patch) | |
| tree | 16b5f3e5d415fb4d5e74ad2b2bacecd769290d48 /packages/CarSystemUI/src | |
| parent | 571568a861707e98ab76e4f44ca4648f0df40f71 (diff) | |
DO NOT MERGE Use round highlight for navigation buttons
Make the focus highlight and touch ripple for buttons in the navigation
bar be round rather than square.
Also fix a bug in the dimming logic. The alpha was applied to the icon
initially, but when the state changed, the alpha was applied to the
entire button.
Launcher in master is quite different so it this change is limited to
rvc-qpr-dev for now.
Test: manual
Bug: 174614908
Bug: 168317872
Change-Id: I9b80946887ad85a73ddd281f7afcc9fcc8280a64
Diffstat (limited to 'packages/CarSystemUI/src')
| -rw-r--r-- | packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationButton.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationButton.java b/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationButton.java index e7e33a5439f9..ddd261a4c018 100644 --- a/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationButton.java +++ b/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationButton.java @@ -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); |