Merge lp:~cmiller/ubuntuone-android-contacts/spinny-images-computed-from-originals-and-hopefully-less-blocky into lp:ubuntuone-android-contacts

Proposed by Chad Miller
Status: Merged
Approved by: Martin Albisetti
Approved revision: 378
Merged at revision: 380
Proposed branch: lp:~cmiller/ubuntuone-android-contacts/spinny-images-computed-from-originals-and-hopefully-less-blocky
Merge into: lp:ubuntuone-android-contacts
Diff against target: 46 lines (+27/-0)
1 file modified
res/drawable/cof_white-orange_hex.svg (+27/-0)
To merge this branch: bzr merge lp:~cmiller/ubuntuone-android-contacts/spinny-images-computed-from-originals-and-hopefully-less-blocky
Reviewer Review Type Date Requested Status
Martin Albisetti (community) Approve
Review via email: mp+33844@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Albisetti (beuno) wrote :

Looks good, go ahead and merge it into trunk (you will need to land it manually).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'res/drawable/cof_white-orange_hex.svg'
2--- res/drawable/cof_white-orange_hex.svg 1970-01-01 00:00:00 +0000
3+++ res/drawable/cof_white-orange_hex.svg 2010-08-26 22:39:56 +0000
4@@ -0,0 +1,27 @@
5+<?xml version="1.0" encoding="utf-8"?>
6+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
7+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
8+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
9+]>
10+<svg version="1.1"
11+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
12+ x="0px" y="0px" width="285px" height="285px" viewBox="-0.866 -0.866 285 285" enable-background="new -0.866 -0.866 285 285"
13+ xml:space="preserve">
14+<defs>
15+</defs>
16+<path fill="#FFFFFF" d="M283.465,141.734c0,78.273-63.457,141.73-141.734,141.73S0,220.008,0,141.734C0,63.455,63.453,0,141.73,0
17+ S283.465,63.455,283.465,141.734z"/>
18+<path fill="#DD4814" d="M45.356,122.812c-10.453,0-18.923,8.47-18.923,18.923c0,10.449,8.47,18.92,18.923,18.92
19+ c10.449,0,18.92-8.471,18.92-18.92C64.276,131.281,55.806,122.812,45.356,122.812z M180.463,208.814
20+ c-9.051,5.225-12.149,16.793-6.926,25.84c5.226,9.051,16.793,12.151,25.844,6.926c9.048-5.224,12.148-16.792,6.923-25.842
21+ C201.08,206.691,189.511,203.59,180.463,208.814z M86.458,141.732c0-18.701,9.293-35.219,23.504-45.221L96.128,73.338
22+ c-16.56,11.064-28.878,27.978-33.995,47.788c5.977,4.872,9.796,12.291,9.796,20.608c0,8.315-3.819,15.734-9.797,20.605
23+ c5.116,19.812,17.435,36.726,33.995,47.789l13.835-23.175C95.751,176.953,86.458,160.436,86.458,141.732z M141.733,86.457
24+ c28.877,0,52.564,22.141,55.047,50.373l26.968-0.394c-1.327-20.844-10.432-39.562-24.425-53.319
25+ c-7.194,2.718-15.505,2.306-22.688-1.842c-7.192-4.152-11.705-11.156-12.941-18.757c-6.992-1.935-14.351-2.99-21.96-2.99
26+ c-13.086,0-25.449,3.072-36.431,8.512l13.146,23.56C125.526,88.307,133.412,86.457,141.733,86.457z M141.733,197.008
27+ c-8.322,0-16.207-1.85-23.285-5.143L105.3,215.427c10.983,5.438,23.347,8.511,36.433,8.511c7.609,0,14.968-1.055,21.961-2.99
28+ c1.236-7.601,5.75-14.605,12.943-18.76c7.183-4.146,15.494-4.558,22.688-1.839c13.992-13.758,23.097-32.476,24.422-53.32
29+ l-26.968-0.394C194.298,174.871,170.61,197.008,141.733,197.008z M180.46,74.649c9.05,5.227,20.619,2.126,25.842-6.921
30+ c5.226-9.051,2.128-20.619-6.923-25.845c-9.049-5.224-20.617-2.124-25.843,6.927C168.312,57.857,171.412,69.426,180.46,74.649z"/>
31+</svg>
32
33=== added file 'res/drawable/cofspin.xcf'
34Binary files res/drawable/cofspin.xcf 1970-01-01 00:00:00 +0000 and res/drawable/cofspin.xcf 2010-08-26 22:39:56 +0000 differ
35=== modified file 'res/drawable/icon_progress_sync_1.png'
36Binary files res/drawable/icon_progress_sync_1.png 2010-08-12 08:37:32 +0000 and res/drawable/icon_progress_sync_1.png 2010-08-26 22:39:56 +0000 differ
37=== modified file 'res/drawable/icon_progress_sync_2.png'
38Binary files res/drawable/icon_progress_sync_2.png 2010-08-12 08:37:32 +0000 and res/drawable/icon_progress_sync_2.png 2010-08-26 22:39:56 +0000 differ
39=== modified file 'res/drawable/icon_progress_sync_3.png'
40Binary files res/drawable/icon_progress_sync_3.png 2010-08-12 08:37:32 +0000 and res/drawable/icon_progress_sync_3.png 2010-08-26 22:39:56 +0000 differ
41=== modified file 'res/drawable/icon_progress_sync_4.png'
42Binary files res/drawable/icon_progress_sync_4.png 2010-08-12 08:37:32 +0000 and res/drawable/icon_progress_sync_4.png 2010-08-26 22:39:56 +0000 differ
43=== modified file 'res/drawable/icon_progress_sync_5.png'
44Binary files res/drawable/icon_progress_sync_5.png 2010-08-12 08:37:32 +0000 and res/drawable/icon_progress_sync_5.png 2010-08-26 22:39:56 +0000 differ
45=== modified file 'res/drawable/icon_progress_sync_6.png'
46Binary files res/drawable/icon_progress_sync_6.png 2010-08-12 08:37:32 +0000 and res/drawable/icon_progress_sync_6.png 2010-08-26 22:39:56 +0000 differ

Subscribers

People subscribed via source and target branches