summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorSai Cheemalapati <saicheems@google.com>2014-07-15 16:25:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-15 16:05:01 +0000
commit434dbcc2f581619f79a691e1a39c5e69003a9d16 (patch)
treebc805cf5061d1f2326f3eba25d41614dc3dde78a /res
parent2bc98d35f3a491b7bc46c27863d266c38abe5ef0 (diff)
parentb77bf5df2b866dd40e330b7c2dedee4a1d51fc78 (diff)
Merge "DO NOT MERGE Added report button to UI and database." into lmp-dev
Diffstat (limited to 'res')
-rw-r--r--res/layout/call_log_list_item_actions.xml19
-rw-r--r--res/values/strings.xml9
2 files changed, 27 insertions, 1 deletions
diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml
index 609f2a98d..22fcca0c2 100644
--- a/res/layout/call_log_list_item_actions.xml
+++ b/res/layout/call_log_list_item_actions.xml
@@ -73,8 +73,25 @@
android:textSize="@dimen/call_log_list_item_actions_text_size"
android:textStyle="bold"
android:nextFocusLeft="@+id/voicemail_action"
- android:nextFocusRight="@+id/primary_action_view"
+ android:nextFocusRight="@+id/report_action"
android:focusable="true"
android:singleLine="true"/>
+ <TextView
+ android:id="@+id/report_action"
+ android:background="@drawable/action_button_background"
+ android:gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingStart="@dimen/call_log_action_horizontal_padding"
+ android:paddingEnd="@dimen/call_log_action_horizontal_padding"
+ android:text="@string/call_log_action_report"
+ android:textColor="?attr/call_log_secondary_text_color"
+ android:textSize="@dimen/call_log_list_item_actions_text_size"
+ android:textStyle="bold"
+ android:nextFocusLeft="@+id/details_action"
+ android:nextFocusRight="@+id/primary_action_view"
+ android:focusable="true"
+ android:singleLine="true"
+ android:visibility="gone"/>
</LinearLayout>
</FrameLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2e7d93e70..e51aff714 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -685,6 +685,15 @@
[CHAR LIMIT=NONE] -->
<string name="toast_entry_removed">Call log entry deleted.</string>
+ <!-- Toast message which appears when a call log contact is reported.
+ [CHAR LIMIT=NONE] -->
+ <string name="toast_caller_id_reported">Contact reported.</string>
+
+ <!-- Button text for the "report" button displayed underneath an entry in the call log.
+ Tapping causes the call log entry to be reported to Google as a bad id.
+ [CHAR LIMIT=30] -->
+ <string name="call_log_action_report">REPORT</string>
+
<!-- String used as a header in the call log above calls which occurred today.
[CHAR LIMIT=65] -->
<string name="call_log_header_today">Today</string>