diff options
author | calderwoodra <calderwoodra@google.com> | 2018-05-22 15:30:39 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-05-29 23:24:53 -0700 |
commit | c5c42189eeab0389a94717de9a66c6d00068e8bf (patch) | |
tree | fbecd02f5176af6c8c2ac6bd620e117d341e62bf /java/com/android/dialer/historyitemactions | |
parent | 4efd0ebf003e985e7cbe40d8ffd9f7ff227a9611 (diff) |
Began implementation of Dialer dark theme.
- README on how to properly theme Dialer going forward.
- Migrated all widgets to use global colors.
- Removed all activity and application themes where it wasn't necessary.
- Added themeing test rule for Espresso tests.
Bug: 79883035
Test: tap
PiperOrigin-RevId: 197634256
Change-Id: I4b7d94d45aeeb59d484b0069fdd1e200a654910b
Diffstat (limited to 'java/com/android/dialer/historyitemactions')
4 files changed, 6 insertions, 8 deletions
diff --git a/java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java b/java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java index e3e9e7a64..206a2d3d0 100644 --- a/java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java +++ b/java/com/android/dialer/historyitemactions/HistoryItemActionBottomSheet.java @@ -23,7 +23,6 @@ import android.support.annotation.NonNull; import android.support.design.widget.BottomSheetBehavior; import android.support.design.widget.BottomSheetBehavior.BottomSheetCallback; import android.support.design.widget.BottomSheetDialog; -import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -34,6 +33,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; import com.android.dialer.common.Assert; +import com.android.dialer.theme.base.ThemeUtil; import com.android.dialer.widget.ContactPhotoView; import java.util.List; @@ -156,9 +156,7 @@ public class HistoryItemActionBottomSheet extends BottomSheetDialog implements O .setImageResource(module.getDrawableId()); if (module.tintDrawable()) { ((ImageView) moduleView.findViewById(R.id.module_image)) - .setImageTintList( - ColorStateList.valueOf( - ContextCompat.getColor(getContext(), R.color.secondary_text_color))); + .setImageTintList(ColorStateList.valueOf(ThemeUtil.getColorIcon())); } moduleView.setOnClickListener(this); moduleView.setTag(module); diff --git a/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml b/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml index 5fe40939e..afda32722 100644 --- a/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml +++ b/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml @@ -40,13 +40,13 @@ <TextView android:id="@+id/primary_text" - style="@style/Dialer.TextAppearance.Primary" + style="@style/Dialer.TextAppearance.Primary.Ellipsize" android:layout_width="wrap_content" android:layout_height="wrap_content"/> <TextView android:id="@+id/secondary_text" - style="@style/Dialer.TextAppearance.Secondary" + style="@style/Dialer.TextAppearance.Secondary.Ellipsize" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2dp"/> diff --git a/java/com/android/dialer/historyitemactions/res/layout/module_layout.xml b/java/com/android/dialer/historyitemactions/res/layout/module_layout.xml index 6b54e5e8b..f89ed82dc 100644 --- a/java/com/android/dialer/historyitemactions/res/layout/module_layout.xml +++ b/java/com/android/dialer/historyitemactions/res/layout/module_layout.xml @@ -35,5 +35,5 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - style="@style/Dialer.TextAppearance.Primary"/> + style="@style/Dialer.TextAppearance.Primary.Ellipsize"/> </LinearLayout>
\ No newline at end of file diff --git a/java/com/android/dialer/historyitemactions/res/values/styles.xml b/java/com/android/dialer/historyitemactions/res/values/styles.xml index 98e2ec999..ed5c18638 100644 --- a/java/com/android/dialer/historyitemactions/res/values/styles.xml +++ b/java/com/android/dialer/historyitemactions/res/values/styles.xml @@ -19,7 +19,7 @@ <item name="android:windowDrawsSystemBarBackgrounds">false</item> <item name="android:windowTranslucentNavigation">false</item> <item name="android:windowTranslucentStatus">false</item> - <item name="android:navigationBarColor">?android:attr/colorBackground</item> + <item name="android:navigationBarColor">?android:attr/colorBackgroundFloating</item> </style> <style name="HistoryItemBottomSheet" parent="HistoryItemBottomSheet.Base"> |