diff options
author | Qi Wang <wangqi@google.com> | 2016-03-31 11:11:01 -0700 |
---|---|---|
committer | Qi Wang <wangqi@google.com> | 2016-04-04 10:26:51 -0700 |
commit | 4bbb9c8b606eee55462bfd5d96c50d4fbabe819f (patch) | |
tree | 2cf9fc112b08338d91ed192802888e77ba9249aa /res | |
parent | 4af1acfc1e76c65578feb0e985b5e201f4239444 (diff) |
Integrate spam feature into call logs.
+ Add block and report spam actions.
+ Show spam icon and label for call log item.
+ Add stableIds for CallLogAdapter to improve performance(reuse same
viewItem to minimize update work).
* Fix funky UI of call log.
Change-Id: I6144d70b6a8e38061e1447d0d01910d53026d1db
Fix: 27295728
Fix: 26907466
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/call_log_list_item_actions.xml | 59 | ||||
-rw-r--r-- | res/values/strings.xml | 23 |
2 files changed, 78 insertions, 4 deletions
diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml index 78203b72d..4aad6195a 100644 --- a/res/layout/call_log_list_item_actions.xml +++ b/res/layout/call_log_list_item_actions.xml @@ -129,10 +129,61 @@ </LinearLayout> - <ViewStub - android:id="@+id/extended_blocking_actions_container" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> + <LinearLayout + android:id="@+id/block_report_action" + style="@style/CallLogActionStyle" + android:visibility="gone"> + + <ImageView + style="@style/CallLogActionIconStyle" + android:src="@drawable/ic_block_24dp"/> + + <TextView + style="@style/CallLogActionTextStyle" + android:text="@string/call_log_action_block_report_number" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/block_action" + style="@style/CallLogActionStyle" + android:visibility="gone"> + + <ImageView + style="@style/CallLogActionIconStyle" + android:src="@drawable/ic_block_24dp"/> + + <TextView + style="@style/CallLogActionTextStyle" + android:text="@string/call_log_action_block_number" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/unblock_action" + style="@style/CallLogActionStyle" + android:visibility="gone"> + + <ImageView + style="@style/CallLogActionIconStyle" + android:src="@drawable/ic_unblock"/> + + <TextView + style="@style/CallLogActionTextStyle" + android:text="@string/call_log_action_unblock_number" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/report_not_spam_action" + style="@style/CallLogActionStyle" + android:visibility="gone"> + + <ImageView + style="@style/CallLogActionIconStyle" + android:src="@drawable/ic_unblock"/> + + <TextView + style="@style/CallLogActionTextStyle" + android:text="@string/call_log_action_remove_spam" /> + </LinearLayout> <LinearLayout android:id="@+id/details_action" diff --git a/res/values/strings.xml b/res/values/strings.xml index ee9418a8b..5fca528e9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1043,4 +1043,27 @@ <!-- Accessibility announcement to indicate which call is active --> <string name="accessibility_call_is_active"><xliff:g id="nameOrNumber">^1</xliff:g> is active</string> + + <!-- Button text for a button displayed underneath an entry in the call log, which marks the + phone number represented by the call log entry as a Spam number. + [CHAR LIMIT=30] --> + <string name="call_log_action_block_report_number">Block/report spam</string> + + <!-- Button text for a button displayed underneath an entry in the call log, which marks the + phone number represented by the call log entry as a Spam number. + [CHAR LIMIT=30] --> + <string name="call_log_action_block_number">Block</string> + + <!-- Button text for a button displayed underneath an entry in the call log, which removes the + phone number represented by the call log entry from the Spam numbers list. + [CHAR LIMIT=30] --> + <string name="call_log_action_remove_spam">Not spam</string> + + <!-- Button text for a button displayed underneath an entry in the call log, which removes the + phone number represented by the call log entry from the blacklisted numbers. + [CHAR LIMIT=30] --> + <string name="call_log_action_unblock_number">Unblock</string> + + <!-- Label under the name of a spam number in the call log. [CHAR LIMIT=15] --> + <string name="spam_number_call_log_label">Spam</string> </resources> |