summaryrefslogtreecommitdiff
path: root/res/layout
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-10-28 18:26:00 -0700
committerAndrew Lee <anwlee@google.com>2015-10-29 14:39:26 -0700
commit0539c35bc125843217db999c935be991365c5b6c (patch)
tree4b1c0f7545a85f605bfa0701902ccd2d952e109f /res/layout
parent72579fe971e0a0c3711438e8852d9659f48101c8 (diff)
Restyle add button for blocked number settings.
+ Convert from button into list item with ripple feedback. - Removed divider line between list items, including the custom background drawable which used to be used to achieve the divider only for the bottom border. Bug: 25356667 Change-Id: Ic19fd8b895b7b12a140c64a945f8ac8571e0a510
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/blocked_number_header.xml27
-rw-r--r--res/layout/blocked_number_item.xml4
2 files changed, 21 insertions, 10 deletions
diff --git a/res/layout/blocked_number_header.xml b/res/layout/blocked_number_header.xml
index 29a05bd26..57f5df0e2 100644
--- a/res/layout/blocked_number_header.xml
+++ b/res/layout/blocked_number_header.xml
@@ -136,18 +136,29 @@
android:layout_height="1dp"
android:layout_below="@id/import_button"
android:background="@color/divider_line_color"
- android:layout_marginTop="8dp"
- android:layout_marginBottom="8dp" />
+ android:layout_marginTop="8dp" />
</RelativeLayout>
- <Button android:id="@+id/add_number_button"
- android:layout_width="wrap_content"
+ <TextView android:id="@+id/add_number_textview"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="end"
- android:layout_marginEnd="@dimen/blocked_number_container_padding"
- android:layout_marginBottom="8dp"
- android:text="@string/blockNumber" />
+ android:background="?android:attr/selectableItemBackground"
+ android:textColor="@color/blocked_number_primary_text_color"
+ android:textSize="@dimen/blocked_number_primary_text_size"
+ android:paddingTop="24dp"
+ android:paddingBottom="24dp"
+ android:paddingEnd="@dimen/blocked_number_container_padding"
+ android:paddingStart="24dp"
+ android:drawableStart="@drawable/ic_blocked_numbers_settings_add"
+ android:drawablePadding="24dp"
+ android:text="@string/addBlockedNumber" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginStart="72dp"
+ android:background="@color/divider_line_color" />
</LinearLayout>
diff --git a/res/layout/blocked_number_item.xml b/res/layout/blocked_number_item.xml
index 79ca42e14..82e2207b7 100644
--- a/res/layout/blocked_number_item.xml
+++ b/res/layout/blocked_number_item.xml
@@ -25,7 +25,7 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:focusable="true"
- android:background="@drawable/blocked_number_item_background">
+ android:background="@android:color/white">
<QuickContactBadge
android:id="@+id/quick_contact_photo"
@@ -69,7 +69,7 @@
android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_remove"
android:scaleType="center"
- android:tint="@color/delete_icon_tint"
+ android:tint="@color/blocked_number_icon_tint"
android:contentDescription="@string/description_blocked_number_list_delete" />
</LinearLayout>