diff options
Diffstat (limited to 'java/com/android/dialer/dialpadview')
5 files changed, 8 insertions, 20 deletions
diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml index 7f82d74fe..66013c64c 100644 --- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml +++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml @@ -76,7 +76,7 @@ android:contentDescription="@string/description_dial_button" android:src="@drawable/quantum_ic_call_white_24" android:visibility="invisible" - app:backgroundTint="@color/dialpad_fab_green" + app:backgroundTint="@color/dialer_call_green" app:elevation="@dimen/floating_action_button_translation_z"/> </RelativeLayout> </LinearLayout> diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml index d3ebeb06c..3497d2ab5 100644 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml +++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml @@ -66,9 +66,9 @@ android:layout_centerHorizontal="true" android:contentDescription="@string/description_dial_button" android:src="@drawable/quantum_ic_call_vd_theme_24" - android:tint="#ffffff" + android:tint="?colorIconOnUnthemedDarkBackground" android:visibility="invisible" - app:backgroundTint="@color/dialpad_fab_green" - app:colorControlNormal="#ffffff" + app:backgroundTint="@color/dialer_call_green" + app:colorControlNormal="?colorIconOnUnthemedDarkBackground" app:elevation="@dimen/floating_action_button_translation_z"/> </view> diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml index 69d23a9b6..9953fa3b4 100644 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml +++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml @@ -81,7 +81,7 @@ android:contentDescription="@string/description_dialpad_back" android:gravity="center" android:src="@drawable/quantum_ic_close_white_24" - android:tint="?attr/dialpad_icon_tint" + android:tint="?colorIcon" android:tintMode="src_in" android:visibility="gone"/> @@ -96,7 +96,7 @@ android:contentDescription="@string/description_dialpad_overflow" android:gravity="center" android:src="@drawable/quantum_ic_more_vert_white_24" - android:tint="?attr/dialpad_icon_tint" + android:tint="?colorIcon" android:tintMode="src_in" android:visibility="gone"/> <FrameLayout android:layout_width="0dp" @@ -108,7 +108,7 @@ android:focusable="false" android:gravity="center" android:textSize="14sp" - android:textColor="@color/secondary_text_color" + android:textColor="?colorIcon" android:visibility="gone" /> <com.android.dialer.dialpadview.DigitsEditText @@ -142,7 +142,7 @@ android:contentDescription="@string/description_delete_button" android:src="@drawable/quantum_ic_backspace_white_24" android:state_enabled="false" - android:tint="?attr/dialpad_icon_tint" + android:tint="?colorIcon" android:tintMode="src_in"/> </LinearLayout> diff --git a/java/com/android/dialer/dialpadview/theme/res/values/attr.xml b/java/com/android/dialer/dialpadview/theme/res/values/attr.xml index 99707aa1d..9cd225ad2 100644 --- a/java/com/android/dialer/dialpadview/theme/res/values/attr.xml +++ b/java/com/android/dialer/dialpadview/theme/res/values/attr.xml @@ -32,8 +32,6 @@ <attr format="color" name="dialpad_text_color"/> <attr format="color" name="dialpad_text_color_primary"/> <attr format="color" name="dialpad_text_color_secondary"/> - <attr format="color" name="dialpad_icon_tint"/> - <attr format="color" name="dialpad_voicemail_tint"/> <attr format="color" name="dialpad_background"/> <attr format="dimension" name="dialpad_elevation"/> </declare-styleable> diff --git a/java/com/android/dialer/dialpadview/theme/res/values/styles.xml b/java/com/android/dialer/dialpadview/theme/res/values/styles.xml index 408a33dd1..04ebb1b13 100644 --- a/java/com/android/dialer/dialpadview/theme/res/values/styles.xml +++ b/java/com/android/dialer/dialpadview/theme/res/values/styles.xml @@ -36,16 +36,6 @@ <item name="dialpad_text_color">?android:attr/textColorSecondary</item> <item name="dialpad_text_color_primary">?android:attr/colorPrimary</item> <item name="dialpad_text_color_secondary">?android:attr/textColorSecondary</item> - <item name="dialpad_icon_tint">?colorIcon</item> - <item name="dialpad_voicemail_tint">?colorIcon</item> <item name="dialpad_background">?android:attr/colorBackgroundFloating</item> </style> - - <style name="Dialpad.Dark"> - <item name="dialpad_text_color">@android:color/white</item> - <item name="dialpad_text_color_primary">@android:color/white</item> - <item name="dialpad_text_color_secondary">#ffd4d6d7</item> - <item name="dialpad_icon_tint">@android:color/white</item> - <item name="dialpad_background">#00000000</item> - </style> </resources>
\ No newline at end of file |