summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* am c7536cfa: Merge "Show sync error toast only when both loading and syncing ↵Bart Sears2012-10-307-15/+58
|\ | | | | | | | | | | | | are done." into gb-ub-photos-arches * commit 'c7536cfa819d10e0c556ecb30c53a58c048fa327': Show sync error toast only when both loading and syncing are done.
| * Merge "Show sync error toast only when both loading and syncing are done." ↵Bart Sears2012-10-307-15/+58
| |\ | | | | | | | | | into gb-ub-photos-arches
| | * Show sync error toast only when both loading and syncing are done.Hung-ying Tyan2012-10-307-15/+58
| | | | | | | | | | | | | | | Bug: 7427597 Change-Id: Ie1fe8510e2a2225424b3c2892b2c0a8b4021324c
* | | am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-archesGeorge Mount2012-10-301-32/+0
|\| | | | | | | | | | | | | | * commit 'aa8228a42b25b60f0663770beea9acdce536f699': Don't use an album for UriImages.
| * | Don't use an album for UriImages.George Mount2012-10-291-32/+0
| |/ | | | | | | | | | | Bug 7422455 Change-Id: Ic9b0ae762b56f6734a1bd452c6c877431b90c0a6
* | Merge "Gallery: Do not set the background to null for video." into ↵Teng-Hui Zhu2012-10-301-21/+0
|\ \ | | | | | | | | | gb-ub-photos-bryce
| * | Gallery: Do not set the background to null for video.Teng-Hui Zhu2012-10-301-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix screen corruption when exit while video complete or rotate while video playing. bug:7405595 Change-Id: I8b559390a284e5c850bc02a76add86c4de600144
* | | Disable save button when there's no modificationDoris Liu2012-10-293-13/+24
| |/ |/| | | | | | | Bug: 7353884 Change-Id: I1b88e8b8ab3a92aad1226c60062a17a2f4badfb9
* | Reset rotation flagnicolasroard2012-10-291-1/+1
| | | | | | | | | | bug:7386221 Change-Id: I45a615a880a96d54bbde0a5ce648e02ff86db1de
* | Merge "Fix zooming position" into gb-ub-photos-archesnicolasroard2012-10-294-29/+180
|\ \
| * | Fix zooming positionnicolasroard2012-10-284-31/+180
| | | | | | | | | | | | | | | bug:7386221 Change-Id: I70215d3c3e12d08eee40a3cc848e3fc50f7dda75
* | | Do not copy XMP data if it has TinyPlanet filterJohn Hoford2012-10-281-0/+4
| | | | | | | | | | | | | | | bug:7429072 Change-Id: I791db8ae8157741eb4cd74e9b6f749275b6b6cc3
* | | Fix rounding issue affecting TinyPlanetnicolasroard2012-10-271-3/+6
|/ / | | | | | | | | bug:7428061 Change-Id: Ieeb4c27d4c426d7052c49ca88ca61ff0785000a3
* | Merge "Changed rotated display parameter increments to 90." into ↵Nicolas Roard2012-10-261-1/+1
|\ \ | | | | | | | | | gb-ub-photos-arches
| * | Changed rotated display parameter increments to 90.Ruben Brunk2012-10-261-1/+1
| | | | | | | | | | | | | | | Bug: 7393432 Change-Id: Id94a28c88cc06a7d99aab0d01dae4fc59cefbab2
* | | Merge "change thumbnail and reset behaviour" into gb-ub-photos-archesNicolas Roard2012-10-262-11/+43
|\ \ \
| * | | change thumbnail and reset behaviourJohn Hoford2012-10-262-11/+43
| | | | | | | | | | | | | | | | | | | | | | | | bug:7386757 bug:7343047 Change-Id: I0b44309f047b790025fb806ce041e2265489f027
* | | | Merge "Show panoViewer icon after "Back" from viewer" into gb-ub-photos-archesDoris Liu2012-10-261-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Show panoViewer icon after "Back" from viewerDoris Liu2012-10-261-1/+2
| |/ / | | | | | | | | | | | | Bug: 7407942 Change-Id: I00da3c73a558e412e106f089034e83f2e75616e4
* / / Remove black borders in Manta LightCycle capture after orientation change.George Mount2012-10-261-0/+7
|/ / | | | | | | | | | | Bug 7344906 Change-Id: I70017e4479962d49aedb06ea7b050f638e00fc06
* | Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-archesBobby Georgescu2012-10-261-7/+11
|\ \ | |/ |/|
| * Fix the black lines near edge of thumbnailsOwen Lin2012-10-261-7/+11
| | | | | | | | | | | | | | | | | | 1. Correct the positions of right and bottom borders 2. Turn off blending by using PoterDuffMode.SRC bug: 7414307 Change-Id: Icc6fd765c2b1e904308c53aa66b55600e0016471
* | Merge "Add proxy launcher" into gb-ub-photos-archesJohn Reck2012-10-261-56/+10
|\ \
| * | Add proxy launcherJohn Reck2012-10-251-56/+10
| | | | | | | | | | | | | | | | | | Bug: 7394901 Change-Id: I667a6e6fbd11d4c02dc536067bb6f3813775db9c
* | | Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-archesBobby Georgescu2012-10-263-31/+80
|\ \ \ | |_|/ |/| |
| * | Hold WakeLock for batch delete operationBobby Georgescu2012-10-253-31/+80
| | | | | | | | | | | | | | | Bug: 6680729 Change-Id: I0bdd59edb60c746c8c9e3c3608be980247f0d91a
* | | Fix colors in rotate and mirrornicolasroard2012-10-262-2/+6
| | | | | | | | | | | | | | | bug:7419025 Change-Id: Icf92de032f62f93a3ac57e042ea582c760d9f600
* | | Merge "Fix crash when showing history" into gb-ub-photos-archesnicolasroard2012-10-252-1/+4
|\ \ \
| * | | Fix crash when showing historynicolasroard2012-10-252-1/+4
| | | | | | | | | | | | | | | | | | | | bug:7418823 Change-Id: I0a84bb4d8fc8b42fc953f8301bb2b24cf64edce7
* | | | Merge "Fix tiling effect when open a photo." into gb-ub-photos-archesHung-ying Tyan2012-10-252-2/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Fix tiling effect when open a photo.Owen Lin2012-10-252-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Don't draw the tiles of full image before screen nail is ready. 2. Upload multiple tiles in each frame in order to show photo quickly. bug: 7403409 Change-Id: Ic5a88a29fe302068e97ab81ab260d0cc572dd7ff
* | | | Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-archesNicolas Roard2012-10-251-5/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Do not add crop into preset if in inital setupJohn Hoford2012-10-251-5/+7
| | | | | | | | | | | | | | | | | | | | bug:7417545 Change-Id: I355936645e555e3d6b950923af301b437570dd93
* | | | Merge "Add loading spinner" into gb-ub-photos-archesJohn Reck2012-10-251-0/+15
|\ \ \ \
| * | | | Add loading spinnerJohn Reck2012-10-251-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7408575 Change-Id: Ia737b36abb88d75381f41c25474e3cc03448dbb9
* | | | | Merge "Handle 360 panorama specific MIME type." into gb-ub-photos-archesMangesh Ghiware2012-10-251-2/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Handle 360 panorama specific MIME type.Mangesh Ghiware2012-10-251-2/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 7407448 Change-Id: I939a061e2100c2cdc17279982de98f1d446d8aef
* | | | Merge "Fix issue where aspect bounds don't get applied." into ↵Ruben Brunk2012-10-252-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | gb-ub-photos-arches
| * | | | Fix issue where aspect bounds don't get applied.Ruben Brunk2012-10-252-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7407937 Change-Id: Ie6484d6458657d6284e04de755a8cc1a912dfb6c
* | | | | Merge "Fixed crop intent." into gb-ub-photos-archesRuben Brunk2012-10-252-2/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed crop intent.Ruben Brunk2012-10-252-2/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Bug: 7415140 Bug: 7403813 Change-Id: I545162544f845d210d21185cddaca09b219fb091
* | | | Merge "Get rid of black lines near edge of thumbnails" into gb-ub-photos-archesBobby Georgescu2012-10-251-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Get rid of black lines near edge of thumbnailsBobby Georgescu2012-10-251-2/+2
| |/ / | | | | | | | | | | | | Bug: 7414307 Change-Id: If77e04945ff6df65301a6802dd40fabc8c329bfa
* / / Fix crash when starting filtereditornicolasroard2012-10-252-5/+16
|/ / | | | | | | | | bug:7415170 Change-Id: I9d54b1179f343aa089bfd9a065ecddaa8a4283b8
* | Force renderring request for Camera Animation.Angus Kong2012-10-252-0/+6
| | | | | | | | | | bug:7410862 Change-Id: I439186f2fea5ee0939ddcfcb9d77a49d0047727b
* | Fix default for tiny planetnicolasroard2012-10-241-0/+5
| | | | | | | | | | bug:7410938 Change-Id: If43317c2ad1e22ca1a3d3de1eef91ea2556252dd
* | Fix update viewnicolasroard2012-10-241-0/+1
| | | | | | | | | | bug:7410583 Change-Id: I8e773bc4ba550c2a362b46e5a6488ad7b3c29646
* | Merge "Remove the old photo editor" into gb-ub-photos-archesnicolasroard2012-10-2488-7043/+0
|\ \
| * | Remove the old photo editornicolasroard2012-10-2488-7043/+0
| | | | | | | | | | | | | | | | | | bug:7407573 Change-Id: Ifac6d3d7cec02c9cb8ef8bbd390f0512e6cdb66c (cherry picked from commit a96c8e9c9aac509ba074b340c66e31e20ec05823)
* | | Merge "Fixes TinyPlanet crashed due to too excessive memory usage." into ↵Sascha Haeberling2012-10-241-6/+10
|\ \ \ | | | | | | | | | | | | gb-ub-photos-arches