diff options
Diffstat (limited to 'java/com/android/dialer/callcomposer')
6 files changed, 13 insertions, 20 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) { diff --git a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml index 4d3769b6d..49d278f30 100644 --- a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml +++ b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml @@ -54,7 +54,7 @@ android:gravity="center" android:maxLines="1" android:ellipsize="end" - android:textColor="?android:attr/colorBackground" + android:textColor="?android:attr/textColorPrimaryInverse" android:textSize="@dimen/call_composer_name_text_size"/> <TextView @@ -62,10 +62,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:maxLines="1" - android:ellipsize="end" - android:textColor="?android:attr/colorBackground" - android:textSize="@dimen/call_composer_number_text_size"/> + android:textColor="?android:attr/textColorPrimaryInverse" + style="@style/Dialer.TextAppearance.Primary"/> </LinearLayout> <QuickContactBadge @@ -151,9 +149,8 @@ android:drawablePadding="@dimen/send_and_call_drawable_padding" android:textAllCaps="true" android:text="@string/share_and_call" - android:textSize="@dimen/send_and_call_text_size" - android:fontFamily="sans-serif-medium" - android:textColor="?android:attr/colorBackground"/> + style="@style/Dialer.TextAppearance.Header2" + android:textColor="?android:attr/textColorPrimaryInverse"/> </FrameLayout> </FrameLayout> diff --git a/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml b/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml index 49df9e679..6255e7289 100644 --- a/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml +++ b/java/com/android/dialer/callcomposer/res/layout/fragment_message_composer.xml @@ -64,7 +64,7 @@ android:paddingBottom="64dp" android:textSize="@dimen/message_compose_item_text_size" android:hint="@string/message_composer_custom_message_hint" - android:textColor="@color/dialer_primary_text_color" + android:textColor="?android:attr/textColorPrimary" android:textColorHint="?android:attr/textColorHint" android:background="?android:attr/colorBackground" android:textCursorDrawable="@drawable/searchedittext_custom_cursor" diff --git a/java/com/android/dialer/callcomposer/res/layout/permission_view.xml b/java/com/android/dialer/callcomposer/res/layout/permission_view.xml index 783ba9867..4248046dc 100644 --- a/java/com/android/dialer/callcomposer/res/layout/permission_view.xml +++ b/java/com/android/dialer/callcomposer/res/layout/permission_view.xml @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/permission_item_margin" - style="@style/TextAppearanceMedium"/> + style="@style/Dialer.TextAppearance.Header2"/> <TextView android:id="@+id/allow" diff --git a/java/com/android/dialer/callcomposer/res/values/styles.xml b/java/com/android/dialer/callcomposer/res/values/styles.xml index aeec2a369..cc0cc9028 100644 --- a/java/com/android/dialer/callcomposer/res/values/styles.xml +++ b/java/com/android/dialer/callcomposer/res/values/styles.xml @@ -30,12 +30,10 @@ <item name="android:actionBarItemBackground">@drawable/item_background_material_borderless_dark</item> </style> - <style name="message_composer_textview"> - <item name="android:textSize">@dimen/message_compose_item_text_size</item> - <item name="android:textColor">@color/dialer_primary_text_color</item> + <style name="message_composer_textview" parent="Dialer.TextAppearance.Primary"> <item name="android:paddingStart">@dimen/message_composer_item_padding</item> <item name="android:paddingEnd">@dimen/message_composer_item_padding</item> - <item name="android:background">@drawable/item_background_material_light</item> + <item name="android:background">?android:attr/selectableItemBackground</item> <item name="android:gravity">center_vertical</item> </style> </resources>
\ No newline at end of file |