summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use NO_VALUE in ground truth of exif test when no valid value from exiftoolEarl Ou2012-10-241-0/+1
| | | | Change-Id: Ia33edf0aba8562eb2dbd61b5753657f245bf7310
* am 67fefdb9: add support for black and white filters, add rotation API to ↵John Hoford2012-10-232-0/+8
|\ | | | | | | | | | | | | tiny planet * commit '67fefdb9b77644c955e1c0c5b1fcd51e2374f212': add support for black and white filters, add rotation API to tiny planet
| * add support for black and white filters, add rotation API to tiny planetJohn Hoford2012-10-232-0/+8
| | | | | | | | | | | | bug:7386370 bug:7389189 Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
* | am 41a3a3be: Fix slider layoutnicolasroard2012-10-231-7/+19
|\| | | | | | | | | * commit '41a3a3be3f263a3b9c902fbec3124a7ea296d525': Fix slider layout
| * Fix slider layoutnicolasroard2012-10-231-7/+19
| | | | | | | | | | bug:7383094 Change-Id: I271728577e5a9fa4e1dbff354b37aee5d2aefb5c
* | am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-archesnicolasroard2012-10-231-5/+17
|\| | | | | | | | | * commit '361f6234c02207b2d812db0b2aeed267013c9a1f': Fix flickering in geometry panel
| * Fix flickering in geometry panelnicolasroard2012-10-231-5/+17
| | | | | | | | | | bug:7344214 Change-Id: I34c980061c2d51e7b97ec95fc77e3331cffdf8d5
* | am a9f280f9: Add copyright noticesnicolasroard2012-10-2311-5/+175
|\| | | | | | | | | * commit 'a9f280f938b5fd5891c5cfe0999f8f1d4945d7a1': Add copyright notices
| * Add copyright noticesnicolasroard2012-10-2311-5/+175
| | | | | | | | | | bug:7387634 Change-Id: Iaac0b55c9857f609312b78a613d074d323174ea1
* | am 2569df23: Merge "Shows filtered images in geometry modules and ↵nicolasroard2012-10-232-5/+23
|\| | | | | | | | | | | | | comparison." into gb-ub-photos-arches * commit '2569df233987d1f43400a813ceb2ce72c738a4c3': Shows filtered images in geometry modules and comparison.
| * Merge "Shows filtered images in geometry modules and comparison." into ↵nicolasroard2012-10-232-5/+23
| |\ | | | | | | | | | gb-ub-photos-arches
| | * Shows filtered images in geometry modules and comparison.nicolasroard2012-10-232-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7279469 bug:7379286 bug:7344214 bug:7379140 Also: - cache multiple version (with/without geometry or filters applied) - doesn't show the original image anymore when waiting for a filtered version (shows nothing instead for now) - fix potential crash in Curves Change-Id: I4eabd42c30f6d370571f177d5efe92550798aed8
* | | am 7c08064b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-10-230-0/+0
|\| | | | | | | | | | | | | | * commit '7c08064bc790dff6ab9da24d8aa07a96c9185b6a': Import translations. DO NOT MERGE
| * | Import translations. DO NOT MERGEBaligh Uddin2012-10-2331-434/+217
| |/ | | | | | | | | Change-Id: I9a98e5d6a8117c370a3b3bb955f6196311efce79 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2012-10-2331-434/+217
| | | | | | | | | | Change-Id: If15c45ec7bcecd33d0b452c9b2ffcbe6a8d75cb1 Auto-generated-cl: translation import
* | am 3a64ad36: Merge "Show panorama thumbs in Gallery grid view" into ↵Doris Liu2012-10-223-0/+0
|\| | | | | | | | | | | | | gb-ub-photos-arches * commit '3a64ad361b9d48407abd902b26949d3c6b34af66': Show panorama thumbs in Gallery grid view
| * Show panorama thumbs in Gallery grid viewDoris Liu2012-10-223-0/+0
| | | | | | | | | | | | | | | | | | | | Bug: 7362229 Bug: 7378208 In addition to showing pano thumbs, this CL also removes the video play icon on the top-level album view thumbnails. Change-Id: I950bc66c38575036d5ad7464a2fd9a5dea9fae4b
* | am 3536bd34: Merge "Increase album label size on high-res screens" into ↵Bobby Georgescu2012-10-221-0/+4
|\| | | | | | | | | | | | | gb-ub-photos-arches * commit '3536bd340f43edfc9f318df5f49e9319e62d0cc4': Increase album label size on high-res screens
| * Merge "Increase album label size on high-res screens" into gb-ub-photos-archesBobby Georgescu2012-10-221-0/+4
| |\
| | * Increase album label size on high-res screensBobby Georgescu2012-10-221-0/+4
| | | | | | | | | | | | | | | Bug: 7382498 Change-Id: I50f5f7c6006fed493918c05f2eb7d2cf3ade3947
* | | am 73c89b45: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2012-10-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '73c89b45b122cbdcbcffa618f0fa2386829d710a': Import translations. DO NOT MERGE
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-archesBaligh Uddin2012-10-2249-294/+591
| |\ \ | | |/ | |/|
| | * Import translations. DO NOT MERGEBaligh Uddin2012-10-2249-294/+591
| | | | | | | | | | | | | | | Change-Id: I0ff70b2e7123f5013834cc5ba819fad8e190e4e0 Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2012-10-2249-294/+591
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2012-10-2249-294/+591
| | | | | | | | | | | | | | | | | | | | Change-Id: I03a600c459c7af2e06140aeb4c7c8ecfb2c37f1d Auto-generated-cl: translation import
* | | | am 0a32b7af: Fix to ensure visible history adapter strings are from xml.Ruben Brunk2012-10-222-5/+19
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '0a32b7afc5286a5c7aa334b9338591d61a49731f': Fix to ensure visible history adapter strings are from xml.
| * / Fix to ensure visible history adapter strings are from xml.Ruben Brunk2012-10-222-5/+19
| |/ | | | | | | | | Bug: 7379327 Change-Id: I5fcb6fec1e9abe05689dd3b9f4e70e518a9e09d1
* | am 4d276f33: Only translate the main panel if we have to.nicolasroard2012-10-211-45/+46
|\| | | | | | | | | * commit '4d276f338bbdc53f8a3b4806265bc26c7fe0ea7c': Only translate the main panel if we have to.
| * Only translate the main panel if we have to.nicolasroard2012-10-211-45/+46
| | | | | | | | | | bug:7386882 Change-Id: Ib670eb4e513f0bbebd3ecca052fe27180dcf5fdc
* | am e9c55b28: Add the infrastructure to support Tiny PlanetJohn Hoford2012-10-191-2/+15
|\| | | | | | | | | * commit 'e9c55b28a4a155c2e1c1f5aec615a0c56e38ade4': Add the infrastructure to support Tiny Planet
| * Add the infrastructure to support Tiny PlanetJohn Hoford2012-10-191-2/+15
| | | | | | | | | | bug:7293391 Change-Id: I25d95b78a832fa5f20b661e13c4028041517da19
* | am 3926a685: Merge "Improves swipe gesture" into gb-ub-photos-archesnicolasroard2012-10-191-0/+2
|\| | | | | | | | | * commit '3926a685eb08ee2bb5e6cf9dc03d070462f19f64': Improves swipe gesture
| * Merge "Improves swipe gesture" into gb-ub-photos-archesnicolasroard2012-10-191-0/+2
| |\
| | * Improves swipe gesturenicolasroard2012-10-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:7379463 - better timings - add original label - remove the gesture detector from ImageZoom (use the parent's one) Change-Id: Ib6879e471dfc21cb3a112aa36a61cd304516cf7f
* | | am 4883dafd: Merge "Change number of album rows on large screens" into ↵Bobby Georgescu2012-10-191-2/+2
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '4883dafd9fc7e242f3cc3dd4155a7b90ee3975a8': Change number of album rows on large screens
| * | Change number of album rows on large screensBobby Georgescu2012-10-191-2/+2
| |/ | | | | | | | | Bug: 7382498 Change-Id: Iec5b0a8491a5b4a6968da9008eab90ddd5d5bcf9
* | am c5590eb1: Improves Curves & Crop UInicolasroard2012-10-183-33/+64
|\| | | | | | | | | * commit 'c5590eb1a20b112e67e4c43684790587f844fc6b': Improves Curves & Crop UI
| * Improves Curves & Crop UInicolasroard2012-10-183-33/+64
| | | | | | | | | | | | | | | | | | | | | | | | bug:7361722 - Use new assets - Add a margin - Add a popup menu - Add a new button showing the current channel - Add popup menu, new assets, new button for Crop as well Change-Id: I0e09098e3135d2213f7f4cd64cd75a3a518a07da
* | am 4b6c20de: Merge "Adding support for tiny planet in gallery" into ↵Doris Liu2012-10-184-0/+13
|\| | | | | | | | | | | | | gb-ub-photos-arches * commit '4b6c20de6fef0aacb464398f2a6bf4b7959f4726': Adding support for tiny planet in gallery
| * Adding support for tiny planet in galleryDoris Liu2012-10-184-0/+13
| | | | | | | | | | Bug: 7344427 Change-Id: I6fad734b28022f45cc551d81212ee4d3a0c867b2
* | am 014a111f: Save XMP & Exif data on edited photosJohn Reck2012-10-181-0/+17
|\| | | | | | | | | * commit '014a111f10a7523415ca210bc6fe1e4f00183d31': Save XMP & Exif data on edited photos
| * Save XMP & Exif data on edited photosJohn Reck2012-10-181-0/+17
| | | | | | | | | | | | | | | | Bug: 7293391 Bug: 7329199 Bug: 7376660 Change-Id: I23b1637a9a494c1dc43b1fc1359cdaf3e75bc23f
* | am d7899c56: Fix undo/redo/back button behaviour with effects and enable historynicolasroard2012-10-185-2/+2
|\| | | | | | | | | * commit 'd7899c56b8df278dfd6720ae11eadc2f89fe8094': Fix undo/redo/back button behaviour with effects and enable history
| * Fix undo/redo/back button behaviour with effects and enable historynicolasroard2012-10-185-2/+2
| | | | | | | | | | | | | | bug:7332980 bug:7357734 bug:7325872 Change-Id: Ie952a410c218c91ac927095ddcf542209fe7b90c
* | am 2576a29c: First cut at a skeleton for the TinyPlanets filter.Sascha Haeberling2012-10-182-0/+7
|\| | | | | | | | | * commit '2576a29cccf1d96edeef071914e8b775c230e8e8': First cut at a skeleton for the TinyPlanets filter.
| * First cut at a skeleton for the TinyPlanets filter.Sascha Haeberling2012-10-182-0/+7
| | | | | | | | | | | | | | | | | | Bug: 7344426 This is not hooking up the real algorithm yet, but unblocks Doris so she can add the button while we rewrite the algorithm. Change-Id: I685b6c189e8ac124670db53c37565c4f1ff1f606
* | am eb4a9359: Fixed initial aspect button text.Ruben Brunk2012-10-182-8/+8
|\| | | | | | | | | * commit 'eb4a9359eaf8a717d6bda5df3d1831cf8f547423': Fixed initial aspect button text.
| * Fixed initial aspect button text.Ruben Brunk2012-10-182-8/+8
| | | | | | | | | | Bug: 7374910 Change-Id: I2c86b7c5b242f930692e2e6feda8a85533c509d8
* | am 12a6e773: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2012-10-170-0/+0
|\| | | | | | | | | | | | | gb-ub-photos-arches * commit '12a6e773a9d35e425ddfaeaa29d68221b6c9d14e': Import translations. DO NOT MERGE
| * Merge "Import translations. DO NOT MERGE" into gb-ub-photos-archesBaligh Uddin2012-10-1749-85/+127
| |\