Show unblock icon for blocked numbers.
Bug: 25095683
Change-Id: I244ec8312ad24081fd36967e063ddccd53b0253c
diff --git a/res/drawable-hdpi/ic_unblock.png b/res/drawable-hdpi/ic_unblock.png
new file mode 100644
index 0000000..03643b2
--- /dev/null
+++ b/res/drawable-hdpi/ic_unblock.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_unblock.png b/res/drawable-mdpi/ic_unblock.png
new file mode 100644
index 0000000..d80fb2f
--- /dev/null
+++ b/res/drawable-mdpi/ic_unblock.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_unblock.png b/res/drawable-xhdpi/ic_unblock.png
new file mode 100644
index 0000000..f7dfa21
--- /dev/null
+++ b/res/drawable-xhdpi/ic_unblock.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_unblock.png b/res/drawable-xxhdpi/ic_unblock.png
new file mode 100644
index 0000000..828a487
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_unblock.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_unblock.png b/res/drawable-xxxhdpi/ic_unblock.png
new file mode 100644
index 0000000..99a1842
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_unblock.png
Binary files differ
diff --git a/res/drawable/ic_call_detail_unblock.xml b/res/drawable/ic_call_detail_unblock.xml
new file mode 100644
index 0000000..ba5378b
--- /dev/null
+++ b/res/drawable/ic_call_detail_unblock.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2015 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_unblock"
+ android:tint="@color/call_detail_footer_icon_tint" />
diff --git a/res/layout/call_detail_footer.xml b/res/layout/call_detail_footer.xml
index 048f803..6ee76e6 100644
--- a/res/layout/call_detail_footer.xml
+++ b/res/layout/call_detail_footer.xml
@@ -27,21 +27,21 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/action_block_number"
- android:drawableLeft="@drawable/ic_call_detail_block"
+ android:drawableStart="@drawable/ic_call_detail_block"
style="@style/CallDetailActionItemStyle" />
<TextView android:id="@+id/call_detail_action_copy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/action_copy_number_text"
- android:drawableLeft="@drawable/ic_call_detail_content_copy"
+ android:drawableStart="@drawable/ic_call_detail_content_copy"
style="@style/CallDetailActionItemStyle" />
<TextView android:id="@+id/call_detail_action_edit_before_call"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/action_edit_number_before_call"
- android:drawableLeft="@drawable/ic_call_detail_edit"
+ android:drawableStart="@drawable/ic_call_detail_edit"
android:visibility="gone"
style="@style/CallDetailActionItemStyle" />
@@ -49,7 +49,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/action_report_number"
- android:drawableLeft="@drawable/ic_call_detail_report"
+ android:drawableStart="@drawable/ic_call_detail_report"
android:visibility="gone"
style="@style/CallDetailActionItemStyle" />
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index ef21980..284a578 100644
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -455,8 +455,12 @@
private void updateBlockActionItem() {
if (mBlockedNumberId == null) {
mBlockNumberActionItem.setText(R.string.action_block_number);
+ mBlockNumberActionItem.setCompoundDrawablesWithIntrinsicBounds(
+ R.drawable.ic_call_detail_block, 0, 0, 0);
} else {
mBlockNumberActionItem.setText(R.string.action_unblock_number);
+ mBlockNumberActionItem.setCompoundDrawablesWithIntrinsicBounds(
+ R.drawable.ic_call_detail_unblock, 0, 0, 0);
}
mBlockNumberActionItem.setVisibility(View.VISIBLE);
