Merge "String updates for general dialer settings." into lmp-dev
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 7645736..761f352 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -119,6 +119,7 @@
android:layout_height="@dimen/call_provider_small_icon_size"
android:layout_marginEnd="@dimen/call_log_icon_margin"
android:layout_gravity="center_vertical"
+ android:tint="?attr/call_log_secondary_text_color"
android:scaleType="centerInside"
/>
<TextView
diff --git a/res/layout/call_log_list_item_extra.xml b/res/layout/call_log_list_item_extra.xml
index fbf71f6..3623e3f 100644
--- a/res/layout/call_log_list_item_extra.xml
+++ b/res/layout/call_log_list_item_extra.xml
@@ -24,8 +24,6 @@
<View android:layout_width="match_parent"
android:layout_height="1px"
- android:layout_marginStart="@dimen/call_log_outer_margin"
- android:layout_marginEnd="@dimen/call_log_outer_margin"
android:background="@color/favorite_contacts_separator_color"/>
<LinearLayout android:id="@+id/badge_link_container"
@@ -40,9 +38,11 @@
<ImageView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/badge_image"
+ android:tint="@color/dialpad_primary_text_color"
android:padding="@dimen/call_log_outer_margin"/>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:paddingStart="@dimen/call_log_start_margin"
android:id="@+id/badge_text"
android:textColor="@color/dialpad_primary_text_color"
android:layout_gravity="center_vertical"
@@ -50,8 +50,11 @@
<ImageView android:id="@+id/dismiss_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingTop="8dip"
+ android:layout_gravity="center_vertical"
+ android:layout_marginEnd="@dimen/call_log_icon_margin"
android:src="@drawable/ic_close_dk"
+ android:tint="@color/recent_call_log_item_phone_icon_tint"
+ android:alpha="0.3"
android:background="?android:attr/selectableItemBackground"
android:visibility="gone"
android:contentDescription="@string/description_dismiss"/>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3fb590a..9d0fcd0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -29,6 +29,7 @@
<item name="android:windowContentOverlay">@null</item>
<item name="android:listViewStyle">@style/ListViewStyle</item>
<item name="android:overlapAnchor">true</item>
+ <item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
<item name="activated_background">@drawable/list_item_activated_background</item>
<item name="section_header_background">@drawable/list_title_holo</item>
<item name="list_section_header_height">32dip</item>
@@ -167,4 +168,10 @@
<item name="android:colorAccent">@color/dialtacts_theme_color</item>
<item name="android:textColorLink">@color/dialtacts_theme_color</item>
</style>
+
+ <!-- Inherit from Theme.Material.Light.Dialog instead of Theme.Material.Light.Dialog.Alert
+ since the Alert dialog is private. They are identical anyway. -->
+ <style name="AlertDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
+ <item name="android:colorAccent">@color/dialtacts_theme_color</item>
+ </style>
</resources>