diff options
| author | yueg <yueg@google.com> | 2018-06-20 12:39:05 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-20 12:39:05 -0700 |
| commit | 4eb745c4c684689da44ad723015fe4b253a791de (patch) | |
| tree | b6020fad9967be034c0e4c288bf38e957729bf4f | |
| parent | b06cbb0065b4c9cfe64465d2b94fd523a05b074e (diff) | |
| parent | eb00e72779cc50ccead75aeb83f051483ed427a7 (diff) | |
Merge "Fix text color in MultimediaFragment" am: 87f4ca0659 am: 965625055c
am: eb00e72779
Change-Id: Ie7de1b1b0dea5841da2bb2cf855401aad44be05d
| -rw-r--r-- | java/com/android/incallui/sessiondata/MultimediaFragment.java | 5 | ||||
| -rw-r--r-- | java/com/android/incallui/sessiondata/res/values/styles.xml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/java/com/android/incallui/sessiondata/MultimediaFragment.java b/java/com/android/incallui/sessiondata/MultimediaFragment.java index 6c2490f92..ec3a6ff3a 100644 --- a/java/com/android/incallui/sessiondata/MultimediaFragment.java +++ b/java/com/android/incallui/sessiondata/MultimediaFragment.java @@ -34,6 +34,7 @@ import android.widget.TextView; import com.android.dialer.common.FragmentUtils; import com.android.dialer.common.LogUtil; import com.android.dialer.multimedia.MultimediaData; +import com.android.dialer.theme.base.ThemeComponent; import com.android.incallui.maps.MapsComponent; import com.bumptech.glide.Glide; import com.bumptech.glide.load.DataSource; @@ -106,6 +107,10 @@ public class MultimediaFragment extends Fragment implements AvatarPresenter { @Override public View onCreateView( LayoutInflater layoutInflater, @Nullable ViewGroup viewGroup, @Nullable Bundle bundle) { + layoutInflater = + layoutInflater.cloneInContext( + ThemeComponent.get(getContext()).theme().getThemedContext(getContext())); + if (isSpam) { LogUtil.i("MultimediaFragment.onCreateView", "show spam layout"); return layoutInflater.inflate(R.layout.fragment_spam, viewGroup, false); diff --git a/java/com/android/incallui/sessiondata/res/values/styles.xml b/java/com/android/incallui/sessiondata/res/values/styles.xml index dd898a4e2..fe217f0aa 100644 --- a/java/com/android/incallui/sessiondata/res/values/styles.xml +++ b/java/com/android/incallui/sessiondata/res/values/styles.xml @@ -18,7 +18,7 @@ <resources> <style name="Dialer.Incall.TextAppearance.Message" parent="Dialer.Incall.TextAppearance"> <item name="android:fontFamily">sans-serif</item> - <item name="android:textColor">@android:color/black</item> + <item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textSize">24sp</item> </style> </resources> |