diff options
author | Eric Erfanian <erfanian@google.com> | 2017-08-31 06:57:16 -0700 |
---|---|---|
committer | Roland Levillain <rpl@google.com> | 2017-09-04 18:05:19 +0100 |
commit | fc0eb8ccebcc7846db5e8b5c5430070055679bfa (patch) | |
tree | a8a23c3202e4161ffd57a71095a404db1bcf5735 /java/com/android/dialer/callcomposer/res/values | |
parent | ea7b4dc89590ffa3332766a531e0eab6ffb9aebd (diff) |
Update Dialer source to latest internal Google revision.
Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.
The Dialer team is now switching to a public development model similar
to the telephony team.
This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.
(cherry picked from commit 2ca4318cc1ee57dda907ba2069bd61d162b1baef
and amended to match paths of dependencies under
prebuilts/maven_repo/bumptech/com/github/bumptech/glide/.)
This CL was generated using these commands from a repository at
stage-stage-master at revision ea7b4dc89590ffa3332766a531e0eab6ffb9aebd
("Merge "Update Dialer source to latest internal Google revision." am: c39ea3c55f -s ours"):
git diff --binary 2ca4318cc1ee57dda907ba2069bd61d162b1baef | git apply -R --index
git commit -c 2ca4318cc1ee57dda907ba2069bd61d162b1baef
Test: make, flash install, run
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
Diffstat (limited to 'java/com/android/dialer/callcomposer/res/values')
4 files changed, 11 insertions, 12 deletions
diff --git a/java/com/android/dialer/callcomposer/res/values/colors.xml b/java/com/android/dialer/callcomposer/res/values/colors.xml index 89e55b79a..8393c555f 100644 --- a/java/com/android/dialer/callcomposer/res/values/colors.xml +++ b/java/com/android/dialer/callcomposer/res/values/colors.xml @@ -20,5 +20,4 @@ <color name="call_composer_divider">#12000000</color> <color name="compose_and_call_background">#00BC35</color> <color name="gallery_item_image_color">#607D8B</color> - <color name="gallery_item_background_color">#ECEFF1</color> </resources>
\ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/res/values/dimens.xml b/java/com/android/dialer/callcomposer/res/values/dimens.xml index 083bd0ab5..f4c2c3bef 100644 --- a/java/com/android/dialer/callcomposer/res/values/dimens.xml +++ b/java/com/android/dialer/callcomposer/res/values/dimens.xml @@ -15,15 +15,15 @@ ~ limitations under the License --> <resources> - <dimen name="call_composer_view_pager_height">306dp</dimen> + <dimen name="call_composer_view_pager_height">292dp</dimen> <!-- Contact bar --> <dimen name="call_composer_contact_photo_border_thickness">2dp</dimen> - <dimen name="call_composer_contact_photo_size">116dp</dimen> - <dimen name="call_composer_contact_container_margin_top">58dp</dimen> - <dimen name="call_composer_contact_container_padding_top">58dp</dimen> - <dimen name="call_composer_contact_container_padding_bottom">18dp</dimen> - <dimen name="call_composer_name_text_size">32sp</dimen> + <dimen name="call_composer_contact_photo_size">112dp</dimen> + <dimen name="call_composer_contact_container_margin_top">56dp</dimen> + <dimen name="call_composer_contact_container_padding_top">56dp</dimen> + <dimen name="call_composer_contact_container_padding_bottom">16dp</dimen> + <dimen name="call_composer_name_text_size">28sp</dimen> <dimen name="call_composer_number_text_size">16sp</dimen> <dimen name="call_composer_contact_container_elevation">2dp</dimen> @@ -32,9 +32,7 @@ <dimen name="call_composer_media_bar_height">48dp</dimen> <!-- Send and Call button --> - <dimen name="send_and_call_icon_size">18dp</dimen> <dimen name="send_and_call_text_size">16sp</dimen> - <dimen name="send_and_call_padding">8dp</dimen> <dimen name="send_and_call_drawable_padding">4dp</dimen> <!-- Message Composer --> diff --git a/java/com/android/dialer/callcomposer/res/values/strings.xml b/java/com/android/dialer/callcomposer/res/values/strings.xml index c7dabfa0f..f01e90811 100644 --- a/java/com/android/dialer/callcomposer/res/values/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values/strings.xml @@ -31,8 +31,6 @@ <string name="gallery_item_description">image <xliff:g id="date">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g></string> <!-- Accessibility description for each image in the gallery when no date is present. --> <string name="gallery_item_description_no_date">image</string> - <!-- Content description of button to switch camera to picture more --> - <string name="camera_switch_to_still_mode">Take a photo</string> <!-- Error toast message shown when a camera image failed to attach to the message --> <string name="camera_media_failure">Couldn\'t load camera image</string> <!-- Text for a button to ask for device permissions --> @@ -53,4 +51,7 @@ <!-- 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> + <!-- When a user places a call with an image attached, we show them the in call screen and + display this string "Image uploading..." to let them know why the call hasn't started. --> + <string name="call_composer_image_uploading">Sending image\u2026</string> </resources>
\ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/res/values/styles.xml b/java/com/android/dialer/callcomposer/res/values/styles.xml index 16e7fb622..a03ee4894 100644 --- a/java/com/android/dialer/callcomposer/res/values/styles.xml +++ b/java/com/android/dialer/callcomposer/res/values/styles.xml @@ -34,7 +34,8 @@ <style name="message_composer_textview"> <item name="android:textSize">@dimen/message_compose_item_text_size</item> <item name="android:textColor">@color/dialer_primary_text_color</item> - <item name="android:padding">@dimen/message_composer_item_padding</item> + <item name="android:paddingStart">@dimen/message_composer_item_padding</item> + <item name="android:paddingEnd">@dimen/message_composer_item_padding</item> <item name="android:background">@drawable/item_background_material_light</item> <item name="android:gravity">center_vertical</item> </style> |