summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Add GLES20 canvas implementation.George Mount2012-12-058-55/+1180
| | | | Change-Id: I5680909f31dc097599d0e063aa1f6daba834d3e2
* Merge "Separate GL calls into GLCanvas in preparation for adding GLES2." ↵George Mount2012-11-3011-230/+390
|\ | | | | | | into gb-ub-photos-bryce
| * Separate GL calls into GLCanvas in preparation for adding GLES2.George Mount2012-11-2011-230/+390
| | | | | | | | Change-Id: I2756c14294a36af7905766ee650fa08fb95e9477
* | Improve fling to delete gesture handlingBobby Georgescu2012-11-302-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7419862 Bug: 7301456 Allows flings to start anywhere within the width bounds of the image, even if outside the height bounds, making deletion of panoramas more feasible, and gestures are filtered by length to be able to make flinging easier while still avoiding accidental input. Change-Id: Iac933bfee85865a718ed47eadfed76683eb771d2
* | Refactoring crop, made unconstrained.Ruben Brunk2012-11-298-630/+915
| | | | | | | | | | | | Bug 7401363 Change-Id: I3ef10c43fd2a01216d6d6c8cc77b31ddef3fdd9b
* | am 599393ec: (re-)add vertical/horizontal lines when moving Curves Align ↵nicolasroard2012-11-292-7/+12
|\ \ | | | | | | | | | | | | | | | | | | histogram with Curves grid. * commit '599393ecad6803161d5e901ef625e34cfe088009': (re-)add vertical/horizontal lines when moving Curves Align histogram with Curves grid.
| * | (re-)add vertical/horizontal lines when moving Curvesnicolasroard2012-11-292-7/+12
| | | | | | | | | | | | | | | | | | | | | Align histogram with Curves grid. bug:7361722 Change-Id: I327f3fb0ba844cc09f8b899e59f74d368478d30a
* | | am 65025459: Merge "Added dashed diagonal for crop." into gb-ub-photos-archesNicolas Roard2012-11-293-7/+62
|\| | | | | | | | | | | | | | * commit '6502545991948769bc9ca725dafb9899c2635a01': Added dashed diagonal for crop.
| * | Merge "Added dashed diagonal for crop." into gb-ub-photos-archesNicolas Roard2012-11-293-7/+62
| |\ \
| | * | Added dashed diagonal for crop.Ruben Brunk2012-11-283-7/+62
| | | | | | | | | | | | | | | | | | | | Bug: 7634466 Change-Id: I14c778766d4b00495b2f5f6fa5f87f4877f76381
* | | | am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402)nicolasroard2012-11-282-0/+6
|\| | | | | | | | | | | | | | | | | | | * commit '0a624bb8db70f1e71ca511756b886c68f32fedbe': Fix potential crash (regression introduced with fix for 7406402)
| * | | Fix potential crashnicolasroard2012-11-282-0/+6
| |/ / | | | | | | | | | | | | | | | | | | (regression introduced with fix for 7406402) bug:7406402 Change-Id: I7ba92b4cb4fe2976583eba54a5bd25a29eae9d5c
* | | am 6d867ce0: Set crop ratio to unconstrained by default.nicolasroard2012-11-282-3/+2
|\| | | | | | | | | | | | | | * commit '6d867ce03ea96495d531d7e3f35a21b5aab257ef': Set crop ratio to unconstrained by default.
| * | Set crop ratio to unconstrained by default.nicolasroard2012-11-282-3/+2
| | | | | | | | | | | | | | | bug:7634466 Change-Id: I4b0e82ca77ab19527293334cc96e7b80f2d75535
* | | am 6e9123a6: Merge "Fix flashing in geometry panel" into gb-ub-photos-archesnicolasroard2012-11-282-2/+5
|\| | | | | | | | | | | | | | * commit '6e9123a658d4ed0dcb80dd376c676f043e2f4baa': Fix flashing in geometry panel
| * | Merge "Fix flashing in geometry panel" into gb-ub-photos-archesnicolasroard2012-11-282-2/+5
| |\ \
| | * | Fix flashing in geometry panelnicolasroard2012-11-282-2/+5
| | | | | | | | | | | | | | | | | | | | bug:7406402 Change-Id: If2c6156349b90dfc57c56284ad6d821731e48e1a
* | | | am 3507b925: Merge "Add new borders assets" into gb-ub-photos-archesnicolasroard2012-11-281-1/+11
|\| | | | | | | | | | | | | | | | | | | * commit '3507b925ce1edb2563c076d2d9f01bfadf9f61e5': Add new borders assets
| * | | Merge "Add new borders assets" into gb-ub-photos-archesnicolasroard2012-11-281-1/+11
| |\ \ \
| | * | | Add new borders assetsnicolasroard2012-11-281-1/+11
| | |/ / | | | | | | | | | | | | | | | | bug:7386268 Change-Id: I026c36bdad32ae6a34ce1d5ec83abff319296d30
* | | | am cd84d676: Fix history panel overlapnicolasroard2012-11-281-0/+4
|\| | | | | | | | | | | | | | | | | | | * commit 'cd84d67629075795d4c5c28d980f77ff8d75c593': Fix history panel overlap
| * | | Fix history panel overlapnicolasroard2012-11-281-0/+4
| |/ / | | | | | | | | | | | | bug:7545507 Change-Id: I06236f3025191896c851af1d84dc48a4dde18b1d
* | | am 987bc8aa: Fix wrong colors in Curvesnicolasroard2012-11-281-1/+8
|\| | | | | | | | | | | | | | * commit '987bc8aaafa55c45451937b27d94c1d602de4d68': Fix wrong colors in Curves
| * | Fix wrong colors in Curvesnicolasroard2012-11-281-1/+8
| | | | | | | | | | | | | | | bug:7633765 Change-Id: Ie6d0c175af6a1ade8f225107408ad03e73a289d3
* | | am d24fdf6a: Merge "Fix moving points in the Curves editor" into ↵nicolasroard2012-11-281-1/+5
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'd24fdf6ad148ffeb34a721d90e46d038f5a7b0da': Fix moving points in the Curves editor
| * | Merge "Fix moving points in the Curves editor" into gb-ub-photos-archesnicolasroard2012-11-281-1/+5
| |\ \
| | * | Fix moving points in the Curves editornicolasroard2012-11-281-1/+5
| | | | | | | | | | | | | | | | | | | | bug:7632994 Change-Id: Ibd0b22594ad9be52e32ea860976861e4619fb513
* | | | am 7a36d427: Merge "Added locking to ImageLoader." into gb-ub-photos-archesRuben Brunk2012-11-281-0/+13
|\| | | | | | | | | | | | | | | | | | | * commit '7a36d4275ea0375d4e6a940cc3307dbe716cf85c': Added locking to ImageLoader.
| * | | Merge "Added locking to ImageLoader." into gb-ub-photos-archesRuben Brunk2012-11-281-0/+13
| |\ \ \
| | * | | Added locking to ImageLoader.Ruben Brunk2012-11-281-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7471850 Change-Id: Ifbaf6e3547fad546a6faa94694bc7d3c7bb4711c
* | | | | am e5b979ed: Merge "reduce size of tiny planet if malloc fails" into ↵John Hoford2012-11-281-3/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit 'e5b979edb369877463e07680dddd9983bd2501cb': reduce size of tiny planet if malloc fails
| * | | | Merge "reduce size of tiny planet if malloc fails" into gb-ub-photos-archesJohn Hoford2012-11-281-3/+22
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | reduce size of tiny planet if malloc failsJohn Hoford2012-11-081-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | bug:7477815 Change-Id: I03fec9246e368fb7f929769dc5e5e6266761dc34
* | | | | am 5d2227a7: Merge "Add a triangle to the popup button view" into ↵nicolasroard2012-11-282-5/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-arches * commit '5d2227a793b51f44f664a739cc7e931c40ba4970': Add a triangle to the popup button view
| * | | | Merge "Add a triangle to the popup button view" into gb-ub-photos-archesnicolasroard2012-11-282-5/+34
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add a triangle to the popup button viewnicolasroard2012-10-302-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | bug:7442434 Change-Id: I7b784f2a5662ef694daef6cd926f60694b3eee4f
* | | | | am 6a94446d: Minor fix for some FP rounding errors in crop.Ruben Brunk2012-11-283-5/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '6a94446de01e8b6b034cc537ee3e65d507d47a47': Minor fix for some FP rounding errors in crop.
| * | | | Minor fix for some FP rounding errors in crop.Ruben Brunk2012-11-273-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 7566505 Change-Id: Ic3b849b26e0435e0e51a3ddd80c25d8e6e9949aa
* | | | | Merge "AlbumDataLoader.get returns correct value if not in cache" into ↵Bobby Georgescu2012-11-281-2/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce
| * | | | | AlbumDataLoader.get returns correct value if not in cacheBobby Georgescu2012-11-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7621656 Change-Id: I8b73837f41bf4ac8c753a5d84f251219fde8ae75
* | | | | | resolved conflicts for merge of 3c6a0610 to gb-ub-photos-bryceYour Name2012-11-272-89/+20
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / Change-Id: Iac3fcc4a4b8c0295ec53edf5658169fb5fab021e
| * | | | Remove orientation compensationYour Name2012-11-272-89/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7446056 Change-Id: I6f00617c890961e4d56545406bac9682356c0b15
* | | | | Video: Fix crash in trimming/muting video in GB.Teng-Hui Zhu2012-11-163-29/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically switched to use sherlock actionbar and protect various new methods with API level check. bug:7546257 Change-Id: Ic16f75126c619578a9e9c2520fa264687d89a2e6
* | | | | Merge "Video: Add the mute functionality." into gb-ub-photos-bryceTeng-Hui Zhu2012-11-169-124/+339
|\ \ \ \ \
| * | | | | Video: Add the mute functionality.Teng-Hui Zhu2012-11-149-124/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Enable the mute video functionality. 2. Consolidate the sharing code, especially for file handling. bug:7543943 Change-Id: Ie7ec605996bc3242b1a50385f506e6a50ee2d2fc
* | | | | | am 18b38883: Guard tiles by synchronized block.Angus Kong2012-11-151-40/+52
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | | * commit '18b388839ed9858a3b35cec9a636e5cde58a528a': Guard tiles by synchronized block.
| * | | | Guard tiles by synchronized block.Angus Kong2012-11-141-40/+52
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Tiles might be touched in different threads. bug:7490351 Change-Id: Ie30d43db90cf63f7a6ec6438faabfcae8bca151a
* | | | Remove import exiftagsEarl Ou2012-11-141-1/+0
| | | | | | | | | | | | | | | | Change-Id: Ifa9882a32ab788e02b1ce5f1751d8c976d67c013
* | | | use ExifReader in MediaDetailsEarl Ou2012-11-141-18/+41
| | | | | | | | | | | | | | | | Change-Id: If8c7f32804ba55b4b0351c350e324dc1b6e508d7
* | | | use ExifParser in ImageLoaderEarl Ou2012-11-141-3/+22
| | | | | | | | | | | | | | | | Change-Id: Ibcee97c15b2cc7df3aaa6c6c65535ca00cef2ed6