diff options
Diffstat (limited to 'java/com/android/dialer/main/impl/bottomnav/res')
4 files changed, 6 insertions, 26 deletions
diff --git a/java/com/android/dialer/main/impl/bottomnav/res/drawable/notification_badge.xml b/java/com/android/dialer/main/impl/bottomnav/res/drawable/notification_badge.xml index 59a967a10..dad566b68 100644 --- a/java/com/android/dialer/main/impl/bottomnav/res/drawable/notification_badge.xml +++ b/java/com/android/dialer/main/impl/bottomnav/res/drawable/notification_badge.xml @@ -17,7 +17,7 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <solid android:color="@color/dialer_theme_color"/> + <solid android:color="?android:attr/colorPrimary"/> <corners android:radius="20dp"/> - <stroke android:color="@color/background_dialer_white" android:width="2dp"/> + <stroke android:color="?android:attr/colorBackground" android:width="2dp"/> </shape>
\ No newline at end of file diff --git a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_bar_layout.xml b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_bar_layout.xml index 02ba3abd5..1dd60d8db 100644 --- a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_bar_layout.xml +++ b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_bar_layout.xml @@ -19,7 +19,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_dialer_white" + android:background="?android:attr/colorBackgroundFloating" android:elevation="8dp"> <include diff --git a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml index cb4c6b628..2197b4d21 100644 --- a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml +++ b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml @@ -22,7 +22,7 @@ android:minWidth="80dp" android:minHeight="56dp" android:gravity="center" - android:background="?android:selectableItemBackgroundBorderless"> + android:background="?android:attr/selectableItemBackgroundBorderless"> <FrameLayout android:layout_width="wrap_content" @@ -47,7 +47,7 @@ android:minWidth="20dp" android:gravity="center" android:textSize="12sp" - android:textColor="@color/dialer_primary_text_color_white" + android:textColor="?android:attr/textColorPrimaryInverse" android:background="@drawable/notification_badge" android:fontFamily="sans-serif-medium" android:visibility="invisible"/> @@ -59,6 +59,6 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:textSize="12sp" - android:textColor="@color/dialer_theme_color" + android:textColor="?android:attr/colorPrimary" android:gravity="center_horizontal"/> </com.android.dialer.main.impl.bottomnav.BottomNavItem>
\ No newline at end of file diff --git a/java/com/android/dialer/main/impl/bottomnav/res/values/colors.xml b/java/com/android/dialer/main/impl/bottomnav/res/values/colors.xml deleted file mode 100644 index b858b4f8c..000000000 --- a/java/com/android/dialer/main/impl/bottomnav/res/values/colors.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2018 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 - --> -<resources> - <color name="bottom_nav_icon_selected">@color/dialer_theme_color</color> - <color name="bottom_nav_icon_deselected">@color/dialer_secondary_text_color</color> -</resources> |