diff options
Diffstat (limited to 'java/com/android/dialer/main')
-rw-r--r-- | java/com/android/dialer/main/impl/OldMainActivityPeer.java | 13 | ||||
-rw-r--r-- | java/com/android/dialer/main/impl/bottomnav/BottomNavItem.java | 7 |
2 files changed, 12 insertions, 8 deletions
diff --git a/java/com/android/dialer/main/impl/OldMainActivityPeer.java b/java/com/android/dialer/main/impl/OldMainActivityPeer.java index 62ad5b599..e14c5b97f 100644 --- a/java/com/android/dialer/main/impl/OldMainActivityPeer.java +++ b/java/com/android/dialer/main/impl/OldMainActivityPeer.java @@ -116,8 +116,8 @@ import com.android.dialer.smartdial.util.SmartDialPrefix; import com.android.dialer.speeddial.SpeedDialFragment; import com.android.dialer.storage.StorageComponent; import com.android.dialer.telecom.TelecomUtil; -import com.android.dialer.theme.base.ThemeUtil; -import com.android.dialer.theme.base.ThemeUtil.Theme; +import com.android.dialer.theme.base.Theme; +import com.android.dialer.theme.base.ThemeComponent; import com.android.dialer.util.DialerUtils; import com.android.dialer.util.PermissionsUtil; import com.android.dialer.util.TransactionSafeActivity; @@ -240,15 +240,16 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen /** should be called before {@link AppCompatActivity#setContentView(int)}. */ private void setTheme() { - @Theme int theme = ThemeUtil.getTheme(); + @Theme.Type int theme = ThemeComponent.get(activity).theme().getTheme(); switch (theme) { - case ThemeUtil.DARK: + case Theme.DARK: activity.setTheme(R.style.MainActivityTheme_Dark); break; - case ThemeUtil.LIGHT: + case Theme.LIGHT: + case Theme.LIGHT_M2: activity.setTheme(R.style.MainActivityTheme); break; - case ThemeUtil.UNKNOWN: + case Theme.UNKNOWN: default: throw new IllegalArgumentException("Invalid theme."); } diff --git a/java/com/android/dialer/main/impl/bottomnav/BottomNavItem.java b/java/com/android/dialer/main/impl/bottomnav/BottomNavItem.java index dec6350ae..3a43f8460 100644 --- a/java/com/android/dialer/main/impl/bottomnav/BottomNavItem.java +++ b/java/com/android/dialer/main/impl/bottomnav/BottomNavItem.java @@ -30,7 +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.base.ThemeUtil; +import com.android.dialer.theme.base.ThemeComponent; /** Navigation item in a bottom nav. */ final class BottomNavItem extends LinearLayout { @@ -54,7 +54,10 @@ final class BottomNavItem extends LinearLayout { @Override public void setSelected(boolean selected) { super.setSelected(selected); - int colorId = selected ? ThemeUtil.getColorPrimary() : ThemeUtil.getTextColorSecondary(); + int colorId = + selected + ? ThemeComponent.get(getContext()).theme().getColorPrimary() + : ThemeComponent.get(getContext()).theme().getTextColorSecondary(); image.setImageTintList(ColorStateList.valueOf(colorId)); text.setTextColor(colorId); } |