diff options
| author | Tyler Gunn <tgunn@google.com> | 2014-07-10 21:07:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-10 00:38:28 +0000 |
| commit | 0ccacf209b08eb0058c86512db5a43c313a4bab8 (patch) | |
| tree | c2db1ae968eac595a8deee83f5329595a4a074d4 /res | |
| parent | 659d2f22f093b9549a3d5f7722f6151932c9e93f (diff) | |
| parent | 8b0e858d5b4c50813dbe2b5c244e7013814b23ec (diff) | |
Merge "Adding support for video call icon and data usage in call log."
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-hdpi/ic_videocam_wht_24dp.png | bin | 0 -> 267 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_videocam_wht_24dp.png | bin | 0 -> 215 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_videocam_wht_24dp.png | bin | 0 -> 257 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/ic_videocam_wht_24dp.png | bin | 0 -> 340 bytes | |||
| -rw-r--r-- | res/values/strings.xml | 4 |
5 files changed, 4 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_videocam_wht_24dp.png b/res/drawable-hdpi/ic_videocam_wht_24dp.png Binary files differnew file mode 100644 index 000000000..ecfce9446 --- /dev/null +++ b/res/drawable-hdpi/ic_videocam_wht_24dp.png diff --git a/res/drawable-mdpi/ic_videocam_wht_24dp.png b/res/drawable-mdpi/ic_videocam_wht_24dp.png Binary files differnew file mode 100644 index 000000000..cbb5be2ea --- /dev/null +++ b/res/drawable-mdpi/ic_videocam_wht_24dp.png diff --git a/res/drawable-xhdpi/ic_videocam_wht_24dp.png b/res/drawable-xhdpi/ic_videocam_wht_24dp.png Binary files differnew file mode 100644 index 000000000..814e515bc --- /dev/null +++ b/res/drawable-xhdpi/ic_videocam_wht_24dp.png diff --git a/res/drawable-xxhdpi/ic_videocam_wht_24dp.png b/res/drawable-xxhdpi/ic_videocam_wht_24dp.png Binary files differnew file mode 100644 index 000000000..c21679891 --- /dev/null +++ b/res/drawable-xxhdpi/ic_videocam_wht_24dp.png diff --git a/res/values/strings.xml b/res/values/strings.xml index 2a815261e..13fdf75c5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -737,4 +737,8 @@ Note: AccessibilityServices uses this attribute to announce the purpose of the button. [CHAR LIMIT=NONE] --> <string name="voicemail_play_start_pause">Start or pause playback.</string> + + <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". + [CHAR LIMIT=3] --> + <string name="list_delimeter">", "</string> </resources> |
