summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use 'US-ASCII' as the default charset for ExifParserEarl Ou2012-10-241-2/+2
| | | | Change-Id: I775c84e601f8d33010080b189efd8c2de00d6959
* am 3fb20078: Merge "Fix so mirror gets applied." into gb-ub-photos-archesRuben Brunk2012-10-231-0/+3
|\ | | | | | | | | * commit '3fb2007892a436f704dc168c0549a6c8ee201e4a': Fix so mirror gets applied.
| * Merge "Fix so mirror gets applied." into gb-ub-photos-archesRuben Brunk2012-10-231-0/+3
| |\
| | * Fix so mirror gets applied.Ruben Brunk2012-10-231-0/+3
| | | | | | | | | | | | | | | Bug: 7402773 Change-Id: I531b795c2f43379e9eaf1ad3b9292e62c867ec3c
* | | am d3aebee7: Merge "Support XMP data, fixed read file on another thread" ↵Nicolas Roard2012-10-232-10/+46
|\| | | | | | | | | | | | | | | | | | | | into gb-ub-photos-arches * commit 'd3aebee7b35ff969fce3607a5c051d607ca42ec7': Support XMP data, fixed read file on another thread
| * | Merge "Support XMP data, fixed read file on another thread" into ↵Nicolas Roard2012-10-232-10/+46
| |\ \ | | |/ | |/| | | | gb-ub-photos-arches
| | * Support XMP data, fixed read file on another threadJohn Hoford2012-10-232-10/+46
| | | | | | | | | | | | | | | bug:7293391 Change-Id: I634857dea3c4d0d204c3fb40f0eec9dc1a9af263
* | | am 5d3e6653: Merge "Stay in AlbumPage when dismissing a popup from AP" into ↵Doris Liu2012-10-232-8/+7
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '5d3e665359272f8b7b379461ede24918d6b4537e': Stay in AlbumPage when dismissing a popup from AP
| * | Merge "Stay in AlbumPage when dismissing a popup from AP" into ↵Doris Liu2012-10-232-8/+7
| |\ \ | | |/ | |/| | | | gb-ub-photos-arches
| | * Stay in AlbumPage when dismissing a popup from APDoris Liu2012-10-232-8/+7
| | | | | | | | | | | | | | | | | | Bug: 7384972 Change-Id: Ie2434ecc203a98610f1954b73a3d6916940eb812
* | | am f46da69a: Increased touch tolerance in cropping.Ruben Brunk2012-10-232-5/+10
|\| | | | | | | | | | | | | | * commit 'f46da69aefd9afe0b4326a2fcea8e33c294136bb': Increased touch tolerance in cropping.
| * | Increased touch tolerance in cropping.Ruben Brunk2012-10-232-5/+10
| |/ | | | | | | | | | | Bug: 7342281 Change-Id: Ice2ba5f07074b1518e4064bbda489aae7ba17b22
* | am a4122499: Reworked crop/transform UI.Ruben Brunk2012-10-2310-124/+290
|\| | | | | | | | | * commit 'a41224997ef9be9c0d04534f7b6b9c6b933bfe05': Reworked crop/transform UI.
| * Reworked crop/transform UI.Ruben Brunk2012-10-2310-124/+290
| | | | | | | | | | | | | | | | Bug: 7385644 Bug: 7378335 Bug: 7366075 Change-Id: Iee7e0a0741b69269b08726bad45e29d86834054e
* | am 67fefdb9: add support for black and white filters, add rotation API to ↵John Hoford2012-10-234-2/+71
|\| | | | | | | | | | | | | 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-234-2/+71
| | | | | | | | | | | | bug:7386370 bug:7389189 Change-Id: I1720893000c39edf28a356fb7b56634f004ef120
* | am a850a543: Fix jank when launching editor from Camera filmstripBobby Georgescu2012-10-233-0/+15
|\| | | | | | | | | * commit 'a850a543225e9f7a72c5a49bb6099573c7efda13': Fix jank when launching editor from Camera filmstrip
| * Fix jank when launching editor from Camera filmstripBobby Georgescu2012-10-233-0/+15
| | | | | | | | | | | | | | | | | | Bug: 7301182 Status bar visibility in FilterShow will now match the one in Camera/Gallery so that there isn't weird jank when launching. Change-Id: I3e942633b351264d2cd38cc5b587de32e38521ed
* | am cb993ff1: Merge "Express the borders size in percentages" into ↵nicolasroard2012-10-232-4/+3
|\| | | | | | | | | | | | | gb-ub-photos-arches * commit 'cb993ff18944a7ba1981406c3c8adf3fe36755c0': Express the borders size in percentages
| * Merge "Express the borders size in percentages" into gb-ub-photos-archesnicolasroard2012-10-232-4/+3
| |\
| | * Express the borders size in percentagesnicolasroard2012-10-232-4/+3
| | | | | | | | | | | | | | | bug:7379459 Change-Id: I14c91dbee0480a3880a11b166fcce3673c2ff3eb
* | | am d6453edc: Merge "Fix NPE" into gb-ub-photos-archesJohn Reck2012-10-231-9/+11
|\| | | | | | | | | | | | | | * commit 'd6453edcdbdad2706d8ce4a4fddd8f7df347b78c': Fix NPE
| * | Merge "Fix NPE" into gb-ub-photos-archesJohn Reck2012-10-231-9/+11
| |\ \
| | * | Fix NPEJohn Reck2012-10-231-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 7399438 Change-Id: Ida0bcc0689d5a797e3c60c3ee51542512fbadf1e
* | | | am 7d7f91e1: Merge "Fix NPE in detecting panoramas." into gb-ub-photos-archesGeorge Mount2012-10-232-4/+8
|\| | | | | | | | | | | | | | | | | | | * commit '7d7f91e1771e67af1fca5f2b3f221968df3de077': Fix NPE in detecting panoramas.
| * | | Merge "Fix NPE in detecting panoramas." into gb-ub-photos-archesGeorge Mount2012-10-232-4/+8
| |\ \ \ | | |_|/ | |/| |
| | * | Fix NPE in detecting panoramas.George Mount2012-10-232-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | Bug 7398022 Change-Id: Iae646c424ffbe552d014f563c8f4e5e4385b4724
* | | | am ea636029: Merge "Hide the history panel on rotation" into gb-ub-photos-archesnicolasroard2012-10-231-4/+14
|\| | | | | | | | | | | | | | | | | | | * commit 'ea6360298ca823634c9f2ee8990546f753288da9': Hide the history panel on rotation
| * | | Hide the history panel on rotationnicolasroard2012-10-231-4/+14
| | | | | | | | | | | | | | | | | | | | bug:7386882 Change-Id: Id68fa1680318b85b4b5b5e54221377d504687d93
* | | | am 5d7e98f7: Fix another potential crash in Curvesnicolasroard2012-10-232-4/+8
|\| | | | | | | | | | | | | | | | | | | * commit '5d7e98f781fbd450295850d00adfb50540d53b3f': Fix another potential crash in Curves
| * | | Fix another potential crash in Curvesnicolasroard2012-10-232-4/+8
| | | | | | | | | | | | | | | | | | | | bug:7379140 Change-Id: I5f2f21b56595799c0e46e13bf5278b44803f4080
* | | | am 361f6234: Merge "Fix flickering in geometry panel" into gb-ub-photos-archesnicolasroard2012-10-232-20/+41
|\| | | | | | | | | | | | | | | | | | | * commit '361f6234c02207b2d812db0b2aeed267013c9a1f': Fix flickering in geometry panel
| * | | Merge "Fix flickering in geometry panel" into gb-ub-photos-archesnicolasroard2012-10-232-20/+41
| |\ \ \
| | * | | Fix flickering in geometry panelnicolasroard2012-10-232-20/+41
| | | | | | | | | | | | | | | | | | | | | | | | | bug:7344214 Change-Id: I34c980061c2d51e7b97ec95fc77e3331cffdf8d5
* | | | | am c162c8b7: Merge "Show Panorama viewer button in filmstrip mode" into ↵Bobby Georgescu2012-10-231-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'c162c8b70b795e95ebe53154ddb86ecf188eade0': Show Panorama viewer button in filmstrip mode
| * | | | Merge "Show Panorama viewer button in filmstrip mode" into gb-ub-photos-archesBobby Georgescu2012-10-231-2/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Show Panorama viewer button in filmstrip modeBobby Georgescu2012-10-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7393346 Change-Id: I555ef6cfee0ac3992f0a84c69a1eafc19718ce4c
* | | | | am a9f280f9: Add copyright noticesnicolasroard2012-10-2357-24/+880
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'a9f280f938b5fd5891c5cfe0999f8f1d4945d7a1': Add copyright notices
| * | | | Add copyright noticesnicolasroard2012-10-2357-24/+880
| | |_|/ | |/| | | | | | | | | | | | | | bug:7387634 Change-Id: Iaac0b55c9857f609312b78a613d074d323174ea1
* | | | am ec995b6b: Fix slow / jerky tracking in Curvesnicolasroard2012-10-232-2/+8
|\| | | | | | | | | | | | | | | | | | | * commit 'ec995b6bf6e2476e820b1e02d0d3a567b1ecb2fc': Fix slow / jerky tracking in Curves
| * | | Fix slow / jerky tracking in Curvesnicolasroard2012-10-232-2/+8
| |/ / | | | | | | | | | | | | bug:7394837 Change-Id: I70758b463601faa19d05da58d0163b31df7b4b91
* | | am 2569df23: Merge "Shows filtered images in geometry modules and ↵nicolasroard2012-10-2310-78/+189
|\| | | | | | | | | | | | | | | | | | | | 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-2310-78/+189
| |\ \ | | | | | | | | | | | | gb-ub-photos-arches
| | * | Shows filtered images in geometry modules and comparison.nicolasroard2012-10-2310-78/+189
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into ↵George Mount2012-10-231-0/+1
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '24af89b96e824e4a5f9053c2024f507087117c22': Ensure photo sphere icon shows for panoramas.
| * | Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-archesGeorge Mount2012-10-231-0/+1
| |\ \ | | |/ | |/|
| | * Ensure photo sphere icon shows for panoramas.George Mount2012-10-231-0/+1
| | | | | | | | | | | | | | | | | | Bug 7393844 Change-Id: Id3b0d15606ec6e5d41558cbfc5089c4b1b229c63
* | | am 5fbfe6f1: on entry check if Tiny Planet if not remove UIJohn Hoford2012-10-223-1/+58
|\| | | | | | | | | | | | | | * commit '5fbfe6f1d1f407e68b7334c6a5988f20bcf16d79': on entry check if Tiny Planet if not remove UI
| * | on entry check if Tiny Planet if not remove UIJohn Hoford2012-10-223-1/+58
| | | | | | | | | | | | | | | bug:7391885 Change-Id: Ic2bffa9f9fbaa2d437ce231a1478a1b63a0eed83
* | | am afa5ac4c: Merge "Minor transition tweaks" into gb-ub-photos-archesBobby Georgescu2012-10-221-16/+9
|\| | | | | | | | | | | | | | * commit 'afa5ac4c6f81f0fe8faf072ba84bfa8fd9083a6c': Minor transition tweaks