summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Handle invalid data type in ExifParserEarl Ou2012-10-312-1/+18
| | | | Change-Id: I547021c03ec9e5d53c7452926c2ca5b6bf11dc43
* Handle images with multile APP1 in ExifParserEarl Ou2012-10-311-14/+19
| | | | Change-Id: If88384066b008bc6a68976b6e291cc1dbcd65914
* Handle the last null byte in Exif tag.Earl Ou2012-10-313-28/+75
| | | | Change-Id: Ic802810d11518dfeb80d1338db65b2e1e1cc8476
* Do not use UTF-8 to decode string in ExifOutputStreamEarl Ou2012-10-311-4/+8
| | | | Change-Id: Id0303a9e8a72db1625e8d0f7487be44227b0ce6a
* print image path when setup error in Exif testEarl Ou2012-10-311-9/+13
| | | | Change-Id: Ia4391571695ea518eac53f2b8c6b1a2acb5159c1
* am 310db394: (-s ours) Merge "DO NOT MERGE: Do not set the background to ↵Tenghui Zhu2012-10-300-0/+0
|\ | | | | | | | | | | | | null for video." into gb-ub-photos-arches * commit '310db394adcdb8677b9a3d0f37a4abee63bdbb50': DO NOT MERGE: Do not set the background to null for video.
| * Merge "DO NOT MERGE: Do not set the background to null for video." into ↵Tenghui Zhu2012-10-301-21/+1
| |\ | | | | | | | | | gb-ub-photos-arches
| | * DO NOT MERGE: Do not set the background to null for video.Romain Guy2012-10-301-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #7275145 Bug 7405595 Removing the window background when it's not visible is a good idea to save on performance. Removing *all* the backgrounds is just a silly idea that leads to weird looking results that drive graphics engineers mad for a day until they figure out that everything is working properly and that the app is simply asking the system to draw whatever garbage is left in the GPU's graphics buffers. Cherry pick the Romain's change from jb-mr1-dev: https://googleplex-android-review.googlesource.com/#/c/234571/ Change-Id: Ief88821319989add5fda57ae7b69cdb01f6ccdf4
* | | 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
* | | am dc03ae14: Reset rotation flagnicolasroard2012-10-291-1/+1
|\ \ \ | | |/ | |/| | | | | | | * commit 'dc03ae144d838714446b239f2b0c519d956af6ff': Reset rotation flag
| * | Reset rotation flagnicolasroard2012-10-291-1/+1
| | | | | | | | | | | | | | | bug:7386221 Change-Id: I45a615a880a96d54bbde0a5ce648e02ff86db1de
* | | am 98990049: Merge "Fix zooming position" into gb-ub-photos-archesnicolasroard2012-10-294-29/+180
|\| | | | | | | | | | | | | | * commit '98990049451cda3540f6cff1ae8065c3675ed3d8': Fix zooming position
| * | 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
* | | | am 17540e58: Do not copy XMP data if it has TinyPlanet filterJohn Hoford2012-10-291-0/+4
|\| | | | | | | | | | | | | | | | | | | * commit '17540e58b8454e820a6273365cee94742d9b9900': Do not copy XMP data if it has TinyPlanet filter
| * | | Do not copy XMP data if it has TinyPlanet filterJohn Hoford2012-10-281-0/+4
| | | | | | | | | | | | | | | | | | | | bug:7429072 Change-Id: I791db8ae8157741eb4cd74e9b6f749275b6b6cc3
* | | | am 2d2b69b0: Fix rounding issue affecting TinyPlanetnicolasroard2012-10-271-3/+6
|\| | | | | | | | | | | | | | | | | | | * commit '2d2b69b0d86ad3131faf83164253a5255ff941ed': Fix rounding issue affecting TinyPlanet
| * | | Fix rounding issue affecting TinyPlanetnicolasroard2012-10-271-3/+6
| |/ / | | | | | | | | | | | | bug:7428061 Change-Id: Ieeb4c27d4c426d7052c49ca88ca61ff0785000a3
* | | am a0fe81ad: Merge "Changed rotated display parameter increments to 90." ↵Nicolas Roard2012-10-261-1/+1
|\| | | | | | | | | | | | | | | | | | | | into gb-ub-photos-arches * commit 'a0fe81ade88cb631d068094bb8ec37a91810f45e': Changed rotated display parameter increments to 90.
| * | 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
* | | | am 26cfff70: Merge "change thumbnail and reset behaviour" into ↵Nicolas Roard2012-10-262-11/+43
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '26cfff70e559bcaf91c50def54f2a4e94d3dd50c': change thumbnail and reset behaviour
| * | | 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
* | | | | am 591974bc: Merge "Show panoViewer icon after "Back" from viewer" into ↵Doris Liu2012-10-261-1/+2
|\| | | | | |_|_|/ |/| | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '591974bceb89bccf3376a7c424017e847eca61df': Show panoViewer icon after "Back" from viewer
| * | | 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
* | | | am b6d49492: Remove black borders in Manta LightCycle capture after ↵George Mount2012-10-261-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | orientation change. * commit 'b6d494925ea14a02ef75f58d5d969d7586914ef7': Remove black borders in Manta LightCycle capture after orientation change.
| * | | Remove black borders in Manta LightCycle capture after orientation change.George Mount2012-10-261-0/+7
| |/ / | | | | | | | | | | | | | | | Bug 7344906 Change-Id: I70017e4479962d49aedb06ea7b050f638e00fc06
* | | am 88870365: Merge "Fix the black lines near edge of thumbnails" into ↵Bobby Georgescu2012-10-261-7/+11
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '88870365af146d05162742c5f613fc92483b0a93': Fix the black lines near edge of thumbnails
| * | 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
* | | am 10f975a6: Merge "Add proxy launcher" into gb-ub-photos-archesJohn Reck2012-10-261-56/+10
|\| | | | | | | | | | | | | | * commit '10f975a628badbb400a97872c6704740ef936e46': Add proxy launcher
| * | 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
* | | | am 798f4a91: Merge "Hold WakeLock for batch delete operation" into ↵Bobby Georgescu2012-10-263-31/+80
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '798f4a914d47e69496374051fab386a3536c9698': Hold WakeLock for batch delete operation
| * | | 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
* | | | am 8d8cdf7f: Fix colors in rotate and mirrornicolasroard2012-10-262-2/+6
|\| | | | | | | | | | | | | | | | | | | * commit '8d8cdf7f67db69309fd740ca301fbeaadac8a9f0': Fix colors in rotate and mirror
| * | | Fix colors in rotate and mirrornicolasroard2012-10-262-2/+6
| | | | | | | | | | | | | | | | | | | | bug:7419025 Change-Id: Icf92de032f62f93a3ac57e042ea582c760d9f600
* | | | am 8b3ce9b0: Merge "Fix crash when showing history" into gb-ub-photos-archesnicolasroard2012-10-252-1/+4
|\| | | | | | | | | | | | | | | | | | | * commit '8b3ce9b01275151b653ea138324e47eb66a7b47e': Fix crash when showing history
| * | | 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