Make Block action contingent on system-wide Blacklist setting

The block action within the call notification will only show
if the user hasn't opted to disable the system-wide Blacklist setting.
Likewise for the Block action within the Glowpad.

Change-Id: I20cf94338711c6c3c9fc5b5b4878661a4e24b1db

1 files changed, 86 insertions, 18 deletions

diff --git a/res/values/array.xml b/res/values/array.xml
index ccf9040c..9e6c007e 100644
--- a/res/values/array.xml
+++ b/res/values/array.xml
@@ -20,66 +20,137 @@
     <!-- "Target" resources for the GlowPadView widget used for incoming calls;
          see InCallTouchUi.showIncomingCallWidget() and incall_touch_ui.xml.  -->
 
-    <!-- For audio calls, if respond via SMS is disabled:
+    <!-- For audio calls, if respond via SMS and call blocking are disabled:
          - Answer (drag right)
          - Decline (drag left) -->
-    <array name="incoming_call_widget_audio_without_sms_targets">
+    <array name="incoming_call_widget_audio_without_sms_and_block_targets">
         <item>@drawable/ic_lockscreen_answer</item>
         <item>@null</item>
         <item>@drawable/ic_lockscreen_decline</item>
-        <item>@drawable/ic_lockscreen_block</item>"
+        <item>@null</item>
+    </array>
+    <array name="incoming_call_widget_audio_without_sms_and_block_target_descriptions">
+        <item>@string/description_target_answer</item>
+        <item>@null</item>
+        <item>@string/description_target_decline</item>
+        <item>@null</item>
+    </array>
+    <array name="incoming_call_widget_audio_without_sms_and_block_direction_descriptions">
+        <item>@string/description_direction_right</item>
+        <item>@null</item>
+        <item>@string/description_direction_left</item>
+        <item>@null</item>
+    </array>
+
+    <!-- For audio calls, if respond via SMS is disabled, but call blocking is enabled:
+         - Answer (drag right)
+         - Decline (drag left)
+         - Block (drag down) -->
+    <array name="incoming_call_widget_audio_without_sms_with_block_targets">
+        <item>@drawable/ic_lockscreen_answer</item>
+        <item>@null</item>
+        <item>@drawable/ic_lockscreen_decline</item>
+        <item>@drawable/ic_lockscreen_block</item>
     </array>
-    <array name="incoming_call_widget_audio_without_sms_target_descriptions">
+    <array name="incoming_call_widget_audio_without_sms_with_block_target_descriptions">
         <item>@string/description_target_answer</item>
         <item>@null</item>
         <item>@string/description_target_decline</item>
-        <item>@string/description_target_block</item>"
+        <item>@string/description_target_block</item>
     </array>
-    <array name="incoming_call_widget_audio_without_sms_direction_descriptions">
+    <array name="incoming_call_widget_audio_without_sms_with_block_direction_descriptions">
         <item>@string/description_direction_right</item>
         <item>@null</item>
         <item>@string/description_direction_left</item>
         <item>@string/description_direction_down</item>
     </array>
 
-    <!-- For audio calls, if respond via SMS is enabled:
+    <!-- For audio calls, if respond via SMS is enabled, but call blocking is disabled:
          - Answer (drag right)
          - Respond via SMS (drag up)
          - Decline (drag left) -->
-    <array name="incoming_call_widget_audio_with_sms_targets">
+    <array name="incoming_call_widget_audio_with_sms_without_block_targets">
         <item>@drawable/ic_lockscreen_answer</item>
         <item>@drawable/ic_lockscreen_text</item>
         <item>@drawable/ic_lockscreen_decline</item>
-        <item>@drawable/ic_lockscreen_block</item>"
+        <item>@null</item>
     </array>
-    <array name="incoming_call_widget_audio_with_sms_target_descriptions">
+    <array name="incoming_call_widget_audio_with_sms_without_block_target_descriptions">
         <item>@string/description_target_answer</item>
         <item>@string/description_target_send_sms</item>
         <item>@string/description_target_decline</item>
-        <item>@string/description_target_block</item>"
+        <item>@null</item>
     </array>
-    <array name="incoming_call_widget_audio_with_sms_direction_descriptions">
+    <array name="incoming_call_widget_audio_with_sms_without_block_direction_descriptions">
+        <item>@string/description_direction_right</item>
+        <item>@string/description_direction_up</item>
+        <item>@string/description_direction_left</item>
+        <item>null</item>
+    </array>
+
+    <!-- For audio calls, if respond via SMS and call blocking are enabled:
+         - Answer (drag right)
+         - Respond via SMS (drag up)
+         - Decline (drag left)
+         - Block (drag down) -->
+    <array name="incoming_call_widget_audio_with_sms_and_block_targets">
+        <item>@drawable/ic_lockscreen_answer</item>
+        <item>@drawable/ic_lockscreen_text</item>
+        <item>@drawable/ic_lockscreen_decline</item>
+        <item>@drawable/ic_lockscreen_block</item>
+    </array>
+    <array name="incoming_call_widget_audio_with_sms_and_block_target_descriptions">
+        <item>@string/description_target_answer</item>
+        <item>@string/description_target_send_sms</item>
+        <item>@string/description_target_decline</item>
+        <item>@string/description_target_block</item>
+    </array>
+    <array name="incoming_call_widget_audio_with_sms_and_block_direction_descriptions">
         <item>@string/description_direction_right</item>
         <item>@string/description_direction_up</item>
         <item>@string/description_direction_left</item>
         <item>@string/description_direction_down</item>
     </array>
 
-    <!-- For video calls, if respond via SMS is disabled:
+    <!-- For video calls, if respond via SMS and call blocking are disabled:
          - Answer as video call (drag right)
          - Decline (drag left)
          - Answer as audio call (drag down) -->
+    <array name="incoming_call_widget_video_without_sms_and_block_targets">
+        <item>@drawable/ic_lockscreen_answer</item>
+        <item>@drawable/ic_lockscreen_answer_video</item>
+        <item>@drawable/ic_lockscreen_decline</item>
+        <item>@null</item>
+    </array>
+    <array name="incoming_call_widget_video_without_sms_and_block_target_descriptions">
+        <item>@string/description_target_answer_audio_call</item>
+        <item>@string/description_target_answer_video_call</item>
+        <item>@string/description_target_decline</item>
+        <item>@null</item>
+    </array>
+    <array name="incoming_call_widget_video_without_sms_and_block_direction_descriptions">
+        <item>@string/description_direction_right</item>
+        <item>@string/description_direction_up</item>
+        <item>@string/description_direction_left</item>
+        <item>@null</item>
+    </array>
+
+    <!-- For video calls, if respond via SMS is disabled, but call blocking is enabled:
+         - Answer as audio call (drag right)
+         - Decline (drag left)
+         - Answer as video call (drag up)
+         - Block (drag down) -->
     <array name="incoming_call_widget_video_without_sms_targets">
         <item>@drawable/ic_lockscreen_answer</item>
         <item>@drawable/ic_lockscreen_answer_video</item>
         <item>@drawable/ic_lockscreen_decline</item>
-        <item>@drawable/ic_lockscreen_block</item>"
+        <item>@drawable/ic_lockscreen_block</item>
     </array>
     <array name="incoming_call_widget_video_without_sms_target_descriptions">
         <item>@string/description_target_answer_audio_call</item>
         <item>@string/description_target_answer_video_call</item>
         <item>@string/description_target_decline</item>
-        <item>@string/description_target_block</item>"
+        <item>@string/description_target_block</item>
     </array>
     <array name="incoming_call_widget_video_without_sms_direction_descriptions">
         <item>@string/description_direction_right</item>
@@ -98,21 +169,18 @@
         <item>@drawable/ic_lockscreen_text</item>
         <item>@drawable/ic_lockscreen_decline</item>
         <item>@drawable/ic_lockscreen_answer_video</item>
-        <item>@drawable/ic_lockscreen_block</item>"
     </array>
     <array name="incoming_call_widget_video_with_sms_target_descriptions">
         <item>@string/description_target_answer_audio_call</item>
         <item>@string/description_target_send_sms</item>
         <item>@string/description_target_decline</item>
         <item>@string/description_target_answer_video_call</item>
-        <item>@string/description_target_block</item>"
     </array>
     <array name="incoming_call_widget_video_with_sms_direction_descriptions">
         <item>@string/description_direction_right</item>
         <item>@string/description_direction_up</item>
         <item>@string/description_direction_left</item>
         <item>@string/description_direction_down</item>
-        <item>@string/description_direction_down</item>
     </array>
 
     <!-- For accept/reject upgrade to video in active video call