diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-05-11 20:18:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-11 20:18:46 +0000 |
| commit | 14ceb5d6cee235b772f5f3dba38802665f12ab66 (patch) | |
| tree | 4e43dc9a6d507693e68e9fe32eba0201b843888b /java/com/android/dialer/common/res/values/strings.xml | |
| parent | ced93f2d22bffce3b4cfb9c3bfce862b385537dd (diff) | |
| parent | ef5c101361fc4cf23c12aa7ef24d027155b7554a (diff) | |
Merge changes Ie424d231,Ied6072ca,I1902e527,Ie649a9fb,I11fc1a02, ...
* changes:
Use old BottomSheetBehavior.
Use listeners to drive fragment lifecycles.
Add SpamMetadata to SpamStatus
Prevent showDialpad from adding multiple instances of fragments
Update logging in incallactivity.
Revert null check on dialpadHint
Add @InstallIn and @IncludeInDialerRoot to dagger modules in dialer codebase.
Add RTT after call promo bottomsheet.
Diffstat (limited to 'java/com/android/dialer/common/res/values/strings.xml')
| -rw-r--r-- | java/com/android/dialer/common/res/values/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/java/com/android/dialer/common/res/values/strings.xml b/java/com/android/dialer/common/res/values/strings.xml index cc0594dee..3bd21d5c1 100644 --- a/java/com/android/dialer/common/res/values/strings.xml +++ b/java/com/android/dialer/common/res/values/strings.xml @@ -21,4 +21,6 @@ <string name="content_description_overflow">More options</string> <!-- Text for undo button in snackbar for voicemail deletion/blocking/unblocking number. [CHAR LIMIT=10] --> <string name="snackbar_undo">UNDO</string> + <!-- Text on button of "OK, got it". [CHAR_LIMIT=30] --> + <string name="ok_got_it">OK, got it</string> </resources> |