diff options
author | Yorke Lee <yorkelee@google.com> | 2014-11-17 18:16:45 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 18:16:45 +0000 |
commit | 530a2670d8f10eb84dedcdc01050190f90458ed8 (patch) | |
tree | 6a85a6af6f869ee9f2a824c04a38c55d53f0be1b /res | |
parent | 1c181e1a8350adc91a26475c9f99d2a0a855d469 (diff) | |
parent | f3e9baec89617ce7fde64f2947734e0a39b7bc09 (diff) |
am f3e9baec: am d17df980: am fa14d610: Merge "Add string for redial" into lmp-mr1-dev
* commit 'f3e9baec89617ce7fde64f2947734e0a39b7bc09':
Add string for redial
Move ToneGenerator recreation/release to onStart/onStop
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 317e578af..b645f2711 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -538,11 +538,26 @@ [CHAR LIMIT=21] --> <string name="favorites_menu_all_contacts">ALL CONTACTS</string> - <!-- Button text for the "call back" button displayed underneath an entry in the call log. - Tapping causes a call to be placed to the caller represented by the call log entry. + <!-- Button text for the "call back" button displayed underneath an entry in the call log. This + is used to describe the action of calling a phone number that the user previously received + an incoming call from. Tapping causes a call to be placed to the number represented by the + call log entry. [CHAR LIMIT=30] --> <string name="call_log_action_call_back">CALL BACK</string> + <!-- BUTTON text for the "call" button displayed underneath an entry in the call log. This + is used to describe the action of calling a phone number. Tapping causes a call to be + placed to the number represented by the call log entry. + [CHAR LIMIT=30] --> + <string name="call_log_action_redial">CALL</string> + + <!-- BUTTON text for the "redial" button displayed underneath an entry in the call log. This + is used to describe the action of calling a phone number that the user previously made an + outgoing call to. Tapping causes a call to be placed to the number represented by the call + log entry. + [CHAR LIMIT=30] --> + <string name="call_log_action_redial">REDIAL</string> + <!-- Button text for the "video call" button displayed underneath an entry in the call log. Tapping causes a video call to be placed to the caller represented by the call log entry. [CHAR LIMIT=30] --> |