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/callcomposer | |
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/callcomposer')
-rw-r--r-- | java/com/android/dialer/callcomposer/CameraComposerFragment.java | 5 | ||||
-rw-r--r-- | java/com/android/dialer/callcomposer/GalleryComposerFragment.java | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/java/com/android/dialer/callcomposer/CameraComposerFragment.java b/java/com/android/dialer/callcomposer/CameraComposerFragment.java index a5c65fd9d..4881220e7 100644 --- a/java/com/android/dialer/callcomposer/CameraComposerFragment.java +++ b/java/com/android/dialer/callcomposer/CameraComposerFragment.java @@ -26,7 +26,6 @@ import android.os.Bundle; import android.provider.Settings; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -49,6 +48,7 @@ import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; +import com.android.dialer.theme.base.ThemeComponent; import com.android.dialer.util.PermissionsUtil; /** Fragment used to compose call with image from the user's camera. */ @@ -117,8 +117,7 @@ public class CameraComposerFragment extends CallComposerFragment allowPermission.setOnClickListener(this); permissionText.setText(R.string.camera_permission_text); permissionImage.setImageResource(R.drawable.quantum_ic_camera_alt_white_48); - permissionImage.setColorFilter( - ContextCompat.getColor(getContext(), R.color.dialer_theme_color)); + permissionImage.setColorFilter(ThemeComponent.get(getContext()).theme().getColorPrimary()); permissionView.setVisibility(View.VISIBLE); } else { if (bundle != null) { diff --git a/java/com/android/dialer/callcomposer/GalleryComposerFragment.java b/java/com/android/dialer/callcomposer/GalleryComposerFragment.java index e604ec1b0..626530887 100644 --- a/java/com/android/dialer/callcomposer/GalleryComposerFragment.java +++ b/java/com/android/dialer/callcomposer/GalleryComposerFragment.java @@ -29,7 +29,6 @@ import android.provider.Settings; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.app.LoaderManager.LoaderCallbacks; -import android.support.v4.content.ContextCompat; import android.support.v4.content.CursorLoader; import android.support.v4.content.Loader; import android.view.LayoutInflater; @@ -44,6 +43,7 @@ import com.android.dialer.common.concurrent.DialerExecutor; import com.android.dialer.common.concurrent.DialerExecutorComponent; import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; +import com.android.dialer.theme.base.ThemeComponent; import com.android.dialer.util.PermissionsUtil; import java.util.ArrayList; import java.util.List; @@ -94,8 +94,7 @@ public class GalleryComposerFragment extends CallComposerFragment allowPermission.setOnClickListener(this); permissionText.setText(R.string.gallery_permission_text); permissionImage.setImageResource(R.drawable.quantum_ic_photo_white_48); - permissionImage.setColorFilter( - ContextCompat.getColor(getContext(), R.color.dialer_theme_color)); + permissionImage.setColorFilter(ThemeComponent.get(getContext()).theme().getColorPrimary()); permissionView.setVisibility(View.VISIBLE); } else { if (bundle != null) { |