From c5c42189eeab0389a94717de9a66c6d00068e8bf Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Tue, 22 May 2018 15:30:39 -0700 Subject: 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 --- .../android/dialer/widget/EmptyContentView.java | 11 +++------- .../widget/res/drawable/ripple_material_light.xml | 23 --------------------- .../widget/res/layout-land/empty_content_view.xml | 2 +- .../widget/res/layout/contact_photo_view.xml | 2 +- .../dialer/widget/res/layout/dialer_toolbar.xml | 12 ++++------- .../widget/res/layout/empty_content_view.xml | 2 +- .../dialer/widget/res/layout/fragment_message.xml | 2 +- .../widget/res/layout/selectable_text_view.xml | 5 ++--- .../android/dialer/widget/res/values/colors.xml | 24 ---------------------- 9 files changed, 13 insertions(+), 70 deletions(-) delete mode 100644 java/com/android/dialer/widget/res/drawable/ripple_material_light.xml delete mode 100644 java/com/android/dialer/widget/res/values/colors.xml (limited to 'java/com/android/dialer/widget') diff --git a/java/com/android/dialer/widget/EmptyContentView.java b/java/com/android/dialer/widget/EmptyContentView.java index b99657a10..6d598ff2a 100644 --- a/java/com/android/dialer/widget/EmptyContentView.java +++ b/java/com/android/dialer/widget/EmptyContentView.java @@ -18,9 +18,6 @@ package com.android.dialer.widget; import android.content.Context; import android.content.res.ColorStateList; -import android.content.res.Resources.Theme; -import android.support.annotation.ColorRes; -import android.support.annotation.Nullable; import android.support.annotation.StringRes; import android.util.AttributeSet; import android.view.LayoutInflater; @@ -28,6 +25,7 @@ import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import com.android.dialer.theme.base.ThemeUtil; public class EmptyContentView extends LinearLayout implements View.OnClickListener { @@ -68,6 +66,8 @@ public class EmptyContentView extends LinearLayout implements View.OnClickListen descriptionView = (TextView) findViewById(R.id.empty_list_view_message); actionView = (TextView) findViewById(R.id.empty_list_view_action); actionView.setOnClickListener(this); + + imageView.setImageTintList(ColorStateList.valueOf(ThemeUtil.getColorIconSecondary())); } public void setDescription(int resourceId) { @@ -90,11 +90,6 @@ public class EmptyContentView extends LinearLayout implements View.OnClickListen } } - public void setImageTint(@ColorRes int color, @Nullable Theme theme) { - imageView.setImageTintList( - (ColorStateList.valueOf(getContext().getResources().getColor(color, theme)))); - } - public void setActionLabel(@StringRes int resourceId) { actionLabel = resourceId; if (resourceId == NO_LABEL) { diff --git a/java/com/android/dialer/widget/res/drawable/ripple_material_light.xml b/java/com/android/dialer/widget/res/drawable/ripple_material_light.xml deleted file mode 100644 index 175624c8b..000000000 --- a/java/com/android/dialer/widget/res/drawable/ripple_material_light.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - diff --git a/java/com/android/dialer/widget/res/layout-land/empty_content_view.xml b/java/com/android/dialer/widget/res/layout-land/empty_content_view.xml index 3a7574f53..84e6fc825 100644 --- a/java/com/android/dialer/widget/res/layout-land/empty_content_view.xml +++ b/java/com/android/dialer/widget/res/layout-land/empty_content_view.xml @@ -32,7 +32,7 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:gravity="center_horizontal|top" - android:textColor="@color/empty_list_text_color" + android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/empty_list_message_text_size"/> \ No newline at end of file diff --git a/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml b/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml index 0540a00bc..a75176a22 100644 --- a/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml +++ b/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml @@ -28,19 +28,15 @@ android:layout_height="wrap_content" android:gravity="top" android:textSize="@dimen/toolbar_title_text_size" - android:textColor="?android:attr/colorBackground" - android:fontFamily="sans-serif-medium" - android:maxLines="1" - android:ellipsize="end"/> + android:textColor="?android:attr/textColorPrimaryInverse" + style="@style/Dialer.TextAppearance.Header2"/> + style="@style/Dialer.TextAppearance.Secondary.Ellipsize"/> \ No newline at end of file diff --git a/java/com/android/dialer/widget/res/layout/empty_content_view.xml b/java/com/android/dialer/widget/res/layout/empty_content_view.xml index 9aac6f48f..57bb2fd5c 100644 --- a/java/com/android/dialer/widget/res/layout/empty_content_view.xml +++ b/java/com/android/dialer/widget/res/layout/empty_content_view.xml @@ -30,7 +30,7 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:gravity="center_horizontal|top" - android:textColor="@color/empty_list_text_color" + android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/empty_list_message_text_size"/> \ No newline at end of file + android:background="?android:selectableItemBackground"/> \ No newline at end of file diff --git a/java/com/android/dialer/widget/res/values/colors.xml b/java/com/android/dialer/widget/res/values/colors.xml deleted file mode 100644 index 70c3197cf..000000000 --- a/java/com/android/dialer/widget/res/values/colors.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - #30000000 - - #b2b2b2 - #E1E1E1 - \ No newline at end of file -- cgit v1.2.3