diff options
| author | calderwoodra <calderwoodra@google.com> | 2018-05-23 12:59:03 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-05-29 23:26:22 -0700 |
| commit | a93df43762f1539593da5f90bec16be2be01d281 (patch) | |
| tree | 88c45d7ab1bd0242f6a0873158da6e5152e82ecd /java/com/android/dialer/widget | |
| parent | ffd525d8eb9dbe1bc4d87909b01371743c296a16 (diff) | |
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
Diffstat (limited to 'java/com/android/dialer/widget')
| -rw-r--r-- | java/com/android/dialer/widget/DialerToolbar.java | 3 | ||||
| -rw-r--r-- | java/com/android/dialer/widget/EmptyContentView.java | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/java/com/android/dialer/widget/DialerToolbar.java b/java/com/android/dialer/widget/DialerToolbar.java index fe0e86110..02ec8c02c 100644 --- a/java/com/android/dialer/widget/DialerToolbar.java +++ b/java/com/android/dialer/widget/DialerToolbar.java @@ -23,6 +23,7 @@ import android.support.annotation.StringRes; import android.support.v7.widget.Toolbar; import android.util.AttributeSet; import android.widget.TextView; +import com.android.dialer.theme.base.ThemeComponent; /** Toolbar widget for Dialer. */ public class DialerToolbar extends Toolbar { @@ -37,7 +38,7 @@ public class DialerToolbar extends Toolbar { subtitle = (TextView) findViewById(R.id.subtitle); setElevation(getResources().getDimensionPixelSize(R.dimen.toolbar_elevation)); - setBackgroundColor(getResources().getColor(R.color.dialer_theme_color)); + setBackgroundColor(ThemeComponent.get(context).theme().getColorPrimary()); setNavigationIcon(R.drawable.quantum_ic_close_white_24); setNavigationContentDescription(R.string.toolbar_close); setNavigationOnClickListener(v -> ((Activity) context).finish()); diff --git a/java/com/android/dialer/widget/EmptyContentView.java b/java/com/android/dialer/widget/EmptyContentView.java index 6d598ff2a..c0f9c9cac 100644 --- a/java/com/android/dialer/widget/EmptyContentView.java +++ b/java/com/android/dialer/widget/EmptyContentView.java @@ -25,7 +25,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.dialer.theme.base.ThemeUtil; +import com.android.dialer.theme.base.ThemeComponent; public class EmptyContentView extends LinearLayout implements View.OnClickListener { @@ -67,7 +67,8 @@ public class EmptyContentView extends LinearLayout implements View.OnClickListen actionView = (TextView) findViewById(R.id.empty_list_view_action); actionView.setOnClickListener(this); - imageView.setImageTintList(ColorStateList.valueOf(ThemeUtil.getColorIconSecondary())); + imageView.setImageTintList( + ColorStateList.valueOf(ThemeComponent.get(context).theme().getColorIconSecondary())); } public void setDescription(int resourceId) { |