diff options
author | Andrew Lee <anwlee@google.com> | 2015-06-11 17:32:51 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-11 17:32:51 +0000 |
commit | 17ffd165f034bcf1b6929ac4206354aecbcb3758 (patch) | |
tree | 544f22e0d2ebdbc37eeb428ad611a9975278a4fd /res | |
parent | 28309e70ab1e5099d4083a12e9417b579ca43ee2 (diff) | |
parent | d78fd115d8e0abddc0885ea33ff9f07790009d0c (diff) |
am d78fd115: Merge "Move "Report" to CallDetailActivity." into mnc-dev
* commit 'd78fd115d8e0abddc0885ea33ff9f07790009d0c':
Move "Report" to CallDetailActivity.
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/call_log_list_item_actions.xml | 14 | ||||
-rw-r--r-- | res/menu/call_details_options.xml | 12 | ||||
-rw-r--r-- | res/values/strings.xml | 15 |
3 files changed, 10 insertions, 31 deletions
diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml index 569048b7d..d4c970655 100644 --- a/res/layout/call_log_list_item_actions.xml +++ b/res/layout/call_log_list_item_actions.xml @@ -98,18 +98,4 @@ </LinearLayout> - <LinearLayout - android:id="@+id/report_action" - style="@style/CallLogActionStyle"> - - <ImageView - style="@style/CallLogActionIconStyle" - android:src="@drawable/ic_report_problem_24dp" /> - - <TextView - style="@style/CallLogActionTextStyle" - android:text="@string/call_log_action_report" /> - - </LinearLayout> - </LinearLayout> diff --git a/res/menu/call_details_options.xml b/res/menu/call_details_options.xml index b98ec9ed6..f08b4facd 100644 --- a/res/menu/call_details_options.xml +++ b/res/menu/call_details_options.xml @@ -18,17 +18,17 @@ <item android:id="@+id/menu_trash" android:icon="@drawable/ic_delete_24dp" android:showAsAction="ifRoom" - android:title="@string/recentCalls_trashVoicemail" - android:onClick="onMenuTrashVoicemail" /> + android:title="@string/recentCalls_trashVoicemail" /> <item android:id="@+id/menu_remove_from_call_log" android:icon="@drawable/ic_delete_24dp" android:showAsAction="ifRoom" - android:title="@string/recentCalls_removeFromRecentList" - android:onClick="onMenuRemoveFromCallLog" /> + android:title="@string/recentCalls_removeFromRecentList" /> <item android:id="@+id/menu_edit_number_before_call" - android:title="@string/recentCalls_editNumberBeforeCall" - android:onClick="onMenuEditNumberBeforeCall" /> + android:title="@string/recentCalls_editNumberBeforeCall" /> + + <item android:id="@+id/menu_report" + android:title="@string/call_detail_menu_report" /> </menu> diff --git a/res/values/strings.xml b/res/values/strings.xml index d7902ef61..d3cff9b78 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -47,6 +47,10 @@ <xliff:g id="name">%s</xliff:g> </string> + <!-- Text for a menu item to report a call as having been incorrectly identified. + [CHAR LIMIT=30] --> + <string name="call_detail_menu_report">Report inaccurate number</string> + <!-- Menu item used to copy a number from the call log to the dialer so it can be edited before calling it --> <string name="recentCalls_editNumberBeforeCall">Edit number before call</string> @@ -666,21 +670,10 @@ Call details for <xliff:g id="nameOrNumber" example="John Smith">^1</xliff:g> </string> - <!-- Description for the "report" action for an entry in the call log. This action reports that - the phone number lookup performed for the entry was inaccurate. [CHAR LIMIT=NONE] --> - <string name="description_report_action"> - Report <xliff:g id="nameOrNumber" example="John Smith">^1</xliff:g> - </string> - <!-- Toast message which appears when a call log entry is deleted. [CHAR LIMIT=NONE] --> <string name="toast_entry_removed">Deleted from call history</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> |