From a93df43762f1539593da5f90bec16be2be01d281 Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Wed, 23 May 2018 12:59:03 -0700 Subject: Converted ThemeUtil into a DaggerModule. This enables us to have Google-Sans font in GoogleDialer and Roboto in AOSP. Bug: 79883035 Test: tap PiperOrigin-RevId: 197774497 Change-Id: I1d490ab196a444c62e439444627d659fc42973ea --- .../android/dialer/app/calllog/LegacyVoicemailNotifier.java | 3 ++- java/com/android/dialer/app/calllog/MissedCallNotifier.java | 3 ++- .../com/android/dialer/app/calllog/PhoneCallDetailsHelper.java | 10 ++++++---- .../android/dialer/app/calllog/VisualVoicemailNotifier.java | 3 ++- .../dialer/app/filterednumber/BlockedNumbersFragment.java | 7 +++---- 5 files changed, 15 insertions(+), 11 deletions(-) (limited to 'java/com/android/dialer/app') diff --git a/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java b/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java index f142399d7..ccf12ae12 100644 --- a/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java +++ b/java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java @@ -37,6 +37,7 @@ import com.android.dialer.notification.DialerNotificationManager; import com.android.dialer.notification.NotificationChannelManager; import com.android.dialer.phonenumberutil.PhoneNumberHelper; import com.android.dialer.telecom.TelecomUtil; +import com.android.dialer.theme.base.ThemeComponent; /** Shows a notification in the status bar for legacy vociemail. */ @TargetApi(VERSION_CODES.O) @@ -115,7 +116,7 @@ public final class LegacyVoicemailNotifier { Notification.Builder builder = new Notification.Builder(context) .setSmallIcon(android.R.drawable.stat_notify_voicemail) - .setColor(context.getColor(R.color.dialer_theme_color)) + .setColor(ThemeComponent.get(context).theme().getColorPrimary()) .setWhen(System.currentTimeMillis()) .setContentTitle(notificationTitle) .setContentText(contentText) diff --git a/java/com/android/dialer/app/calllog/MissedCallNotifier.java b/java/com/android/dialer/app/calllog/MissedCallNotifier.java index f671fb7fd..4b5bfba8a 100644 --- a/java/com/android/dialer/app/calllog/MissedCallNotifier.java +++ b/java/com/android/dialer/app/calllog/MissedCallNotifier.java @@ -62,6 +62,7 @@ import com.android.dialer.notification.missedcalls.MissedCallNotificationTags; import com.android.dialer.phonenumbercache.ContactInfo; import com.android.dialer.phonenumberutil.PhoneNumberHelper; import com.android.dialer.precall.PreCall; +import com.android.dialer.theme.base.ThemeComponent; import com.android.dialer.util.DialerUtils; import com.android.dialer.util.IntentUtil; import java.util.Iterator; @@ -396,7 +397,7 @@ public class MissedCallNotifier implements Worker, Void> { return new Notification.Builder(context) .setGroup(MissedCallConstants.GROUP_KEY) .setSmallIcon(android.R.drawable.stat_notify_missed_call) - .setColor(context.getResources().getColor(R.color.dialer_theme_color, null)) + .setColor(ThemeComponent.get(context).theme().getColorPrimary()) .setAutoCancel(true) .setOnlyAlertOnce(true) .setShowWhen(true) diff --git a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java index 108a11bbe..2632fb380 100644 --- a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java +++ b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java @@ -51,7 +51,7 @@ import com.android.dialer.oem.MotorolaUtils; import com.android.dialer.phonenumberutil.PhoneNumberHelper; import com.android.dialer.spannable.ContentWithLearnMoreSpanner; import com.android.dialer.storage.StorageComponent; -import com.android.dialer.theme.base.ThemeUtil; +import com.android.dialer.theme.base.ThemeComponent; import com.android.dialer.util.DialerUtils; import com.android.voicemail.VoicemailClient; import com.android.voicemail.VoicemailComponent; @@ -270,7 +270,9 @@ public class PhoneCallDetailsHelper views.voicemailTranscriptionBrandingView.setTypeface(typeface); views.callLocationAndDate.setTypeface(typeface); views.callLocationAndDate.setTextColor( - details.isRead ? ThemeUtil.getTextColorSecondary() : ThemeUtil.getTextColorPrimary()); + details.isRead + ? ThemeComponent.get(context).theme().getTextColorSecondary() + : ThemeComponent.get(context).theme().getTextColorPrimary()); } private void setNameView(PhoneCallDetailsViews views, PhoneCallDetails details) { @@ -391,11 +393,11 @@ public class PhoneCallDetailsHelper textView.setMovementMethod(LinkMovementMethod.getInstance()); Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE); if (positiveButton != null) { - positiveButton.setTextColor(ThemeUtil.getColorPrimary()); + positiveButton.setTextColor(ThemeComponent.get(context).theme().getColorPrimary()); } Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); if (negativeButton != null) { - negativeButton.setTextColor(ThemeUtil.getTextColorSecondary()); + negativeButton.setTextColor(ThemeComponent.get(context).theme().getTextColorSecondary()); } } diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java b/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java index 793d9627c..a29bb62da 100644 --- a/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java +++ b/java/com/android/dialer/app/calllog/VisualVoicemailNotifier.java @@ -47,6 +47,7 @@ import com.android.dialer.notification.NotificationChannelManager; import com.android.dialer.notification.NotificationManagerUtils; import com.android.dialer.phonenumbercache.ContactInfo; import com.android.dialer.telecom.TelecomUtil; +import com.android.dialer.theme.base.ThemeComponent; import java.util.List; import java.util.Map; @@ -144,7 +145,7 @@ final class VisualVoicemailNotifier { private static NotificationCompat.Builder createNotificationBuilder(@NonNull Context context) { return new NotificationCompat.Builder(context) .setSmallIcon(android.R.drawable.stat_notify_voicemail) - .setColor(context.getColor(R.color.dialer_theme_color)) + .setColor(ThemeComponent.get(context).theme().getColorPrimary()) .setGroup(GROUP_KEY) .setOnlyAlertOnce(true) .setAutoCancel(true); diff --git a/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java b/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java index ab03080f4..bf40fdf3a 100644 --- a/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java +++ b/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java @@ -23,7 +23,6 @@ import android.content.Loader; import android.database.Cursor; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.v4.app.ActivityCompat; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.view.LayoutInflater; @@ -39,7 +38,7 @@ import com.android.dialer.blocking.FilteredNumbersUtil.CheckForSendToVoicemailCo import com.android.dialer.blocking.FilteredNumbersUtil.ImportSendToVoicemailContactsListener; import com.android.dialer.database.FilteredNumberContract; import com.android.dialer.lettertile.LetterTileDrawable; -import com.android.dialer.theme.base.ThemeUtil; +import com.android.dialer.theme.base.ThemeComponent; import com.android.dialer.voicemailstatus.VisualVoicemailEnabledChecker; /** TODO(calderwoodra): documentation */ @@ -75,7 +74,7 @@ public class BlockedNumbersFragment extends ListFragment //replace the icon for add number with LetterTileDrawable(), so it will have identical style LetterTileDrawable drawable = new LetterTileDrawable(getResources()); drawable.setLetter(ADD_BLOCKED_NUMBER_ICON_LETTER); - drawable.setColor(ThemeUtil.getColorIcon()); + drawable.setColor(ThemeComponent.get(getContext()).theme().getColorIcon()); drawable.setIsCircular(true); if (adapter == null) { @@ -119,7 +118,7 @@ public class BlockedNumbersFragment extends ListFragment ActionBar actionBar = ((AppCompatActivity) getActivity()).getSupportActionBar(); ColorDrawable backgroundDrawable = - new ColorDrawable(ActivityCompat.getColor(getActivity(), R.color.dialer_theme_color)); + new ColorDrawable(ThemeComponent.get(getContext()).theme().getColorPrimary()); actionBar.setBackgroundDrawable(backgroundDrawable); actionBar.setDisplayShowCustomEnabled(false); actionBar.setDisplayHomeAsUpEnabled(true); -- cgit v1.2.3