diff options
Diffstat (limited to 'java/com/android/dialer/main')
16 files changed, 36 insertions, 79 deletions
diff --git a/java/com/android/dialer/main/impl/AndroidManifest.xml b/java/com/android/dialer/main/impl/AndroidManifest.xml index d14077377..f0f338a1b 100644 --- a/java/com/android/dialer/main/impl/AndroidManifest.xml +++ b/java/com/android/dialer/main/impl/AndroidManifest.xml @@ -19,6 +19,7 @@ <application> + <!-- TODO(a bug): remove activity themes and only have application wide themes --> <activity android:clearTaskOnLaunch="true" android:exported="true" @@ -27,7 +28,7 @@ android:launchMode="singleTask" android:name="com.android.dialer.main.impl.MainActivity" android:resizeableActivity="true" - android:theme="@style/NuiActivityTheme" + android:theme="@style/MainActivityTheme" android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"> <meta-data diff --git a/java/com/android/dialer/main/impl/MainActivity.java b/java/com/android/dialer/main/impl/MainActivity.java index 2046b048f..1129609ed 100644 --- a/java/com/android/dialer/main/impl/MainActivity.java +++ b/java/com/android/dialer/main/impl/MainActivity.java @@ -78,7 +78,8 @@ public class MainActivity extends TransactionSafeActivity activePeer = getNewPeer(); activePeer.onActivityCreate(savedInstanceState); - showBlockReportSpamDialogReceiver = new ShowBlockReportSpamDialogReceiver(getFragmentManager()); + showBlockReportSpamDialogReceiver = + new ShowBlockReportSpamDialogReceiver(getSupportFragmentManager()); } protected MainActivityPeer getNewPeer() { diff --git a/java/com/android/dialer/main/impl/bottomnav/BottomNavItem.java b/java/com/android/dialer/main/impl/bottomnav/BottomNavItem.java index 2519d23cb..4edb08e55 100644 --- a/java/com/android/dialer/main/impl/bottomnav/BottomNavItem.java +++ b/java/com/android/dialer/main/impl/bottomnav/BottomNavItem.java @@ -30,6 +30,7 @@ import android.widget.LinearLayout; import android.widget.TextView; import com.android.dialer.common.Assert; import com.android.dialer.configprovider.ConfigProviderBindings; +import com.android.dialer.theme.ThemeUtil; /** Navigation item in a bottom nav. */ final class BottomNavItem extends LinearLayout { @@ -53,10 +54,9 @@ final class BottomNavItem extends LinearLayout { @Override public void setSelected(boolean selected) { super.setSelected(selected); - int colorId = selected ? R.color.bottom_nav_icon_selected : R.color.bottom_nav_icon_deselected; - int color = getContext().getColor(colorId); - image.setImageTintList(ColorStateList.valueOf(color)); - text.setTextColor(color); + int colorId = selected ? ThemeUtil.getColorPrimary() : ThemeUtil.getTextColorSecondary(); + image.setImageTintList(ColorStateList.valueOf(colorId)); + text.setTextColor(colorId); } void setup(@StringRes int stringRes, @DrawableRes int drawableRes) { 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> diff --git a/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml b/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml index 3f1e709fb..c7f2d9a01 100644 --- a/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml +++ b/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml @@ -37,7 +37,7 @@ android:id="@+id/promotion_icon" android:layout_width="36dp" android:layout_height="36dp" - android:tint="@color/dialer_theme_color"/> + android:tint="?android:attr/colorPrimary"/> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -70,7 +70,7 @@ android:layout_gravity="end" android:paddingStart="16dp" android:paddingEnd="16dp" - android:backgroundTint="@color/dialer_theme_color" + android:backgroundTint="?android:attr/colorPrimary" android:fontFamily="sans-serif-medium" android:stateListAnimator="@null" android:text="@string/ok_got_it" diff --git a/java/com/android/dialer/main/impl/res/values-v27/styles.xml b/java/com/android/dialer/main/impl/res/values-v27/styles.xml index 86e6f28a6..9462bbc25 100644 --- a/java/com/android/dialer/main/impl/res/values-v27/styles.xml +++ b/java/com/android/dialer/main/impl/res/values-v27/styles.xml @@ -17,10 +17,11 @@ <resources> <!-- Used on sdk 27 and above --> - <style name="NuiActivityTheme" parent="NuiActivityThemeBase"> + <!-- TODO(a bug): refactor into dialer/theme --> + <style name="MainActivityTheme" parent="MainActivityThemeBase"> <!-- Used to change the navigation bar color --> <item name="android:windowLightNavigationBar">true</item> - <item name="android:navigationBarColor">@color/background_dialer_white</item> + <item name="android:navigationBarColor">?android:attr/colorBackgroundFloating</item> <item name="android:navigationBarDividerColor">#E0E0E0</item> </style> </resources>
\ No newline at end of file diff --git a/java/com/android/dialer/main/impl/res/values/strings.xml b/java/com/android/dialer/main/impl/res/values/strings.xml index 121820383..cde78e66d 100644 --- a/java/com/android/dialer/main/impl/res/values/strings.xml +++ b/java/com/android/dialer/main/impl/res/values/strings.xml @@ -21,9 +21,6 @@ <!-- Title for the activity that dials the phone, when launched directly into the dialpad --> <string name="dialpad_activity_title">Phone Keypad</string> - <!-- The description text for the call log tab. --> - <string name="main_call_history_tab_description" tools:ignore="UnusedResources">Call history</string> - <!-- Text for a toolbar button that shows the user their contacts [CHAR LIMIT=NONE] --> <string name="search">@android:string/search_go</string> <!-- A11y announcement to let users know a button will let them search for contacts and places [CHAR LIMIT=NONE] --> diff --git a/java/com/android/dialer/main/impl/res/values/styles.xml b/java/com/android/dialer/main/impl/res/values/styles.xml index 387b1d79e..467cb5be0 100644 --- a/java/com/android/dialer/main/impl/res/values/styles.xml +++ b/java/com/android/dialer/main/impl/res/values/styles.xml @@ -17,47 +17,24 @@ <resources> <!-- Activities should use this theme as their style --> - <style name="NuiActivityTheme" parent="NuiActivityThemeBase"/> + <style name="MainActivityTheme" parent="MainActivityThemeBase"/> <!-- Used as a procy for values-v27/styles.xml --> - <style name="NuiActivityThemeBase" parent="Theme.AppCompat.Light.NoActionBar"> - <!-- App colors --> - <item name="android:colorPrimary">@color/dialtacts_theme_color</item> - <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item> - <item name="android:colorAccent">@color/dialer_secondary_color</item> - - <!-- TODO(calderwoodra): figure out what this is used for, but I think it's for checkboxes --> - <item name="android:colorControlActivated">@color/dialer_theme_color</item> - - <!-- Text colors --> - <item name="android:textColorPrimary">@color/dialer_primary_text_color</item> - <item name="android:textColorSecondary">@color/dialer_secondary_text_color</item> - <item name="android:textColorLink">@color/dialer_theme_color</item> - - <!-- Themeing for material buttons and widgets --> - <item name="android:colorButtonNormal">@color/dialer_theme_color</item> - <item name="android:textAppearanceButton">@style/DialerButtonTextStyle</item> - - <!-- Theme needed for DialpadFragment --> - <item name="dialpad_style">@style/Dialpad.Light</item> - - <!-- Custom theme for Alert Dialogs--> - <item name="android:alertDialogTheme">@style/AlertDialogTheme</item> - + <style name="MainActivityThemeBase" parent="Dialer.ThemeBase.NoActionBar"> <!-- Required for actionmode/multiselect to render properly. --> - <!-- TODO(calderwoodra): Check to see if we can remove this after NewVoicemailFragment launches --> - <item name="actionModeStyle">@style/NuiActionModeStyle</item> + <!-- TODO(a bug): Check to see if we can remove this after NewVoicemailFragment launches --> + <item name="actionModeStyle">@style/MainActionModeStyle</item> <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> </style> <!-- Colors our actionbar in action mode to dialer theme color. --> - <style name="NuiActionModeStyle" parent="@style/Widget.AppCompat.ActionMode"> - <item name="background">@color/dialer_theme_color</item> + <style name="MainActionModeStyle" parent="@style/Widget.AppCompat.ActionMode"> + <item name="background">?android:attr/colorPrimary</item> <item name="titleTextStyle">@style/ActionModeTitleTextStyle</item> </style> <!-- Colors our actionbar text in action mode to dialer white text color. --> <style name="ActionModeTitleTextStyle" parent="@style/TextAppearance.AppCompat.Widget.ActionMode.Title"> - <item name="android:textColor">@color/dialer_primary_text_color_white</item> + <item name="android:textColor">?android:attr/textColorPrimaryInverse</item> </style> </resources> diff --git a/java/com/android/dialer/main/impl/toolbar/res/drawable/custom_cursor.xml b/java/com/android/dialer/main/impl/toolbar/res/drawable/custom_cursor.xml index 008b0a3cc..f352901de 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/drawable/custom_cursor.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/drawable/custom_cursor.xml @@ -16,5 +16,5 @@ --> <shape xmlns:android="http://schemas.android.com/apk/res/android"> <size android:width="2dp"/> - <solid android:color="@color/dialtacts_theme_color"/> + <solid android:color="?android:attr/colorPrimary"/> </shape>
\ No newline at end of file diff --git a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background.xml b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background.xml index 8767057a5..8bc21c4a8 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background.xml @@ -16,5 +16,5 @@ --> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <solid android:color="@color/background_dialer_white"/> + <solid android:color="?android:attr/colorBackground"/> </shape> diff --git a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml index 58cdabe8b..2bbc8d106 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml @@ -16,6 +16,6 @@ --> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <solid android:color="@color/background_dialer_white"/> + <solid android:color="?android:attr/colorBackground"/> <corners android:radius="2dp"/> </shape> diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml index 3bd71b63a..8a8730f78 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml @@ -29,7 +29,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_menu_back_from_search" android:src="@drawable/quantum_ic_arrow_back_vd_theme_24" - android:tint="@color/dialer_theme_color"/> + android:tint="?android:attr/colorPrimary"/> <EditText android:id="@+id/search_view" @@ -46,7 +46,7 @@ android:maxLines="1" android:hint="@string/dialer_hint_find_contact" android:textColor="@color/dialer_secondary_text_color" - android:textColorHint="@color/dialer_edit_text_hint_color" + android:textColorHint="?android:attr/textColorHint" android:textCursorDrawable="@drawable/custom_cursor" android:textSize="16sp"/> diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml index d63fdfe2f..98b856361 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml @@ -18,7 +18,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="@dimen/expanded_search_bar_height" - android:background="@color/dialer_theme_color" + android:background="?android:attr/colorPrimary" app:contentInsetEnd="0dp" app:contentInsetStart="0dp"> <FrameLayout @@ -38,7 +38,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:background="?android:selectableItemBackground" + android:background="?android:attr/selectableItemBackground" android:gravity="center_vertical"> <ImageView @@ -110,7 +110,7 @@ android:id="@+id/remove_view_content" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/dialer_theme_color" + android:background="?android:attr/colorPrimary" android:gravity="center" android:orientation="horizontal" android:visibility="gone"> @@ -122,14 +122,14 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:src="@drawable/quantum_ic_close_vd_theme_24" - android:tint="@color/dialer_primary_text_color_white"/> + android:tint="?android:attr/textColorPrimaryInverse"/> <TextView android:id="@+id/remove_view_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/main_remove_contact" - android:textColor="@color/dialer_primary_text_color_white" + android:textColor="?android:attr/textColorPrimaryInverse" android:textSize="16sp"/> </LinearLayout> </com.android.dialer.app.list.RemoveView> |