diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-06-22 09:39:08 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-06-22 17:23:58 +0000 |
| commit | 842a9777de13bebb1c82f9d57222c52f9ddec558 (patch) | |
| tree | 742285fa641f62ba0b358a65a452f4f65db04ce2 /java/com/android/dialer/callcomposer/res/values | |
| parent | a8a71b12c67ca852382e94d5e6d5d04430529902 (diff) | |
Update AOSP Dialer source from internal google3 repository at
cl/159771812.
Test: make, treehugger
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/159428781 (6/19/2017) to cl/159771812 (6/22/2017).
These changes track the dialer V11 release.
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Merged-In: I39aba7e972bac6e5864e70ed693849d90ecd7e08
Change-Id: Ia87877f7ae67c5b56078477b8b08082de1355315
Diffstat (limited to 'java/com/android/dialer/callcomposer/res/values')
| -rw-r--r-- | java/com/android/dialer/callcomposer/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/callcomposer/res/values/strings.xml | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/java/com/android/dialer/callcomposer/res/values/dimens.xml b/java/com/android/dialer/callcomposer/res/values/dimens.xml index d55540077..083bd0ab5 100644 --- a/java/com/android/dialer/callcomposer/res/values/dimens.xml +++ b/java/com/android/dialer/callcomposer/res/values/dimens.xml @@ -56,4 +56,6 @@ <dimen name="permission_item_margin">8dp</dimen> <dimen name="permission_allow_padding">16dp</dimen> <dimen name="min_touch_target_size">48dp</dimen> + + <dimen name="privacy_toast_y_offset">108dp</dimen> </resources>
\ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/res/values/strings.xml b/java/com/android/dialer/callcomposer/res/values/strings.xml index 0faf46947..c7dabfa0f 100644 --- a/java/com/android/dialer/callcomposer/res/values/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values/strings.xml @@ -47,4 +47,10 @@ <string name="description_call_composer_photo">Choose a photo</string> <!-- Content description of button to show ui for sending a message --> <string name="description_call_composer_message">Send a message</string> + <!-- When a user makes a call with a photo attached, we send the photo through the app "Messages". + This string is shown in a toast for privacy reasons. --> + <string name="image_sent_messages">Photo sent via Messages</string> + <!-- When a user makes a call with text attached, we send the text through the app "Messages". + This string is shown in a toast for privacy reasons. --> + <string name="message_sent_messages">Message sent via Messages</string> </resources>
\ No newline at end of file |