summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* Fix exif data saving for picasa images.Ruben Brunk2013-01-152-117/+98
| | | | | Bug: 7910836 Change-Id: I8ec1a1ab379c35b0602689a8f7850f5c861e0189
* refactoring imageshowJohn Hoford2013-01-1516-363/+305
| | | | Change-Id: I6d0872250b31a427ea6a3e46bd1c9ca5f3ba92ee
* Fixed ClassCastException on open crop aspect menu.Ruben Brunk2013-01-141-2/+2
| | | | | Bug: 7999315 Change-Id: I78bd4c12f5241215629f6eb06fdc7b101ed6ddb6
* Merge "Fix LightCycle capture NullPointerException." into gb-ub-photos-bryceGeorge Mount2013-01-133-0/+23
|\
| * Fix LightCycle capture NullPointerException.George Mount2013-01-133-0/+23
| | | | | | | | | | | | | | | | | | Bug 7987002 During capture animation, allow LightCycle to write the current frame to a texture, then use that texture for drawing the background image. Change-Id: I7891e5cac18ee21ff17910790397459f9d57e408
* | Refactoring button class. Minor bug fixes.Ruben Brunk2013-01-1113-573/+524
|/ | | | | | | Bug: 7875246 Bug: 7459118 Change-Id: Ic1099a7ae0feeeb16c8be3035f9726805149666e
* Merge "Fix slide show animation so that cross fades work." into ↵George Mount2013-01-094-127/+52
|\ | | | | | | gb-ub-photos-bryce
| * Fix slide show animation so that cross fades work.George Mount2013-01-094-127/+52
| | | | | | | | | | | | | | | | | | | | | | Bug 7961297 Removed the "Additive" blending, which didn't do anything, even in OpenGL ES 1.1 implementation. Modified the texturing to change the color of the pixels based on the supplied alpha rather than modifying the alpha. This appears to match the implementation in the OpenGL ES 1.1 pipeline. Change-Id: I52491af1a8a2d727968e4e805bc4bc61647f5cf2
* | Refactor filters managementnicolasroard2013-01-091-46/+11
| | | | | | | | Change-Id: I0e75ad534cf8cc74a132f97836eedd35baeebeae
* | Add the Drama filterJohn Hoford2013-01-081-0/+2
| | | | | | | | Change-Id: I6f026f899b9d991bd6f9e74445f68114041fe781
* | Merge "Add a Draw filter" into gb-ub-photos-bryceJohn Hoford2013-01-083-0/+430
|\ \
| * | Add a Draw filterJohn Hoford2013-01-083-0/+430
| |/ | | | | | | Change-Id: I67aecc9241b4534491fb838b84d0da1a6edbbb54
* | Merge "Refactoring UI editors" into gb-ub-photos-brycenicolasroard2013-01-086-162/+214
|\ \ | |/ |/|
| * Refactoring UI editorsnicolasroard2013-01-086-162/+214
| | | | | | | | | | bug:7688780 Change-Id: I30f8691788332a01d591435474a84cc352b71138
* | Merge "Instantiate GLCanvas rather than reinitialize current GLCanvas." into ↵George Mount2013-01-0811-166/+148
|\ \ | |/ |/| | | gb-ub-photos-bryce
| * Instantiate GLCanvas rather than reinitialize current GLCanvas.George Mount2013-01-0811-166/+148
| | | | | | | | | | | | | | GLCanvas was being used as a singleton when it really should allow separate instances for correctness. Change-Id: I650884e843a4a78997b70826f6012ae19b8df549
* | Replace camera importerBobby Georgescu2013-01-0727-937/+1824
| | | | | | | | Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07
* | Merge "Fix camera->gallery relaunch loop on empty camera album" into ↵Bobby Georgescu2013-01-071-1/+1
|\ \ | |/ |/| | | gb-ub-photos-bryce
| * Fix camera->gallery relaunch loop on empty camera albumBobby Georgescu2013-01-071-1/+1
| | | | | | | | | | Bug: 7952132 Change-Id: I27325abe32177195d07fe310b8c49aca81af9056
* | Fix crash when using red eyes correctionnicolasroard2012-12-271-0/+2
|/ | | | | bug:7680079 Change-Id: Icc6728321f18d09de5676564a3640c4b414c6741
* Made downsampling filter preview accurate.Ruben Brunk2012-12-192-7/+20
| | | | | | Bug: 7892268 Change-Id: I9ab3a7f5077b718ed54206666ef9ef289db8facc
* Use ExifOutputStream in SaveCopyTaskEarl Ou2012-12-191-52/+47
| | | | Change-Id: Ifa68d819249d3871c4a22f6e3dadc69542b9dc28
* Merge "Apply ExifModifier for rotation" into gb-ub-photos-bryceAngus Kong2012-12-192-15/+36
|\
| * Apply ExifModifier for rotationEarl Ou2012-12-192-15/+36
| | | | | | | | Change-Id: Ifa3cee7816ffeacab2415f479234856916acfecf
* | Lock icon in secure album should redirect to gallery after unlock.Wu-cheng Li2012-12-182-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up when launching gallery. bug:7462572 Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0 The auto-merge of this CL from Arches to Bryce had a merge conflict, so I canceled the auto-merge and then did this manual cherry-pick.
* | resolved conflicts for merge of 5b188c94 to gb-ub-photos-bryceBart Sears2012-12-182-1/+36
|\ \ | | | | | | | | | Change-Id: I0b39e54323c8f2ce67816ec223acf72cfacbd191
| * | Disabled further filters after Tiny Planet.Ruben Brunk2012-12-172-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7407176 Temporary fix. We need to handle filters changing the image geometry properly. Change-Id: I405b83acddec4e3b88a8a1d70dc534df15c37f1c
* | | Merge "Move LightCycle to render directly to GLRootView." into ↵George Mount2012-12-173-7/+67
|\ \ \ | | | | | | | | | | | | gb-ub-photos-bryce
| * | | Move LightCycle to render directly to GLRootView.George Mount2012-12-173-7/+67
| | | | | | | | | | | | | | | | Change-Id: I298ef7127d86ca37067ffa953640aad1747961f9
* | | | Improved performance for Kmeans filter.Ruben Brunk2012-12-171-2/+39
| | | | | | | | | | | | | | | | | | | | Bug: 7739334 Change-Id: I5ab1eb429d65f84449a61deca962a47f2b6dbc8b
* | | | Add relativePath field into photo widget dbDoris Liu2012-12-147-43/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7481248 The bug is caused by the change of external storage going from JB to JBMR1. In light of this change, a new field has been added to the photo widget app database to store the relative path for the local album. With the relative paths stored, the widget app should be more resilient to future storage path changes. Change-Id: Ia2497b882ae67178fa0632f23e07673b82d3a942
* | | | Merge "Gallery in separate task for up button in Camera filmstrip" into ↵Bobby Georgescu2012-12-141-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | gb-ub-photos-bryce
| * | | | Gallery in separate task for up button in Camera filmstripBobby Georgescu2012-12-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7738398 Change-Id: I297c15f0a3e537d96d79b05e1dd8d376ff59bfca
* | | | | Removed filtershow geometry editor preview interpolating. It looks bad.Ruben Brunk2012-12-133-3/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I790ce00e85c835f73c076f79cde5e65236131f49
* | | | | Remove preview dithering from Geometry editor in filtershow.Ruben Brunk2012-12-133-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7739904 Change-Id: I25c3cbe8907dd921aeb68f217fa9703e703d34a8
* | | | | Merge "Refactoring: removed unused presets." into gb-ub-photos-bryceRuben Brunk2012-12-134-157/+0
|\ \ \ \ \
| * | | | | Refactoring: removed unused presets.Ruben Brunk2012-12-134-157/+0
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I1390bf65048a6cbd4dee5ee9cd472dc440352860
* | | | | Added downsampling filter.Ruben Brunk2012-12-132-1/+71
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7690079 Change-Id: I235524127da848b1cbcca159cec43d1e0dcb5bf2
* | | | | Merge "Refactoring: removed unused filters." into gb-ub-photos-bryceRuben Brunk2012-12-138-280/+0
|\ \ \ \ \
| * | | | | Refactoring: removed unused filters.Ruben Brunk2012-12-138-280/+0
| |/ / / / | | | | | | | | | | | | | | | Change-Id: If6344fde16607ab9dddb25922d295b1df205df6b
* | | | | Merge "Refactoring: removed old filtershow slider." into gb-ub-photos-bryceRuben Brunk2012-12-132-30/+0
|\ \ \ \ \
| * | | | | Refactoring: removed old filtershow slider.Ruben Brunk2012-12-132-30/+0
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Iebd2f18c0f4819e7ff32be638e96b519f3ce905c
* / / / / Fix Seekbar infinite recursion.Ruben Brunk2012-12-132-14/+15
|/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 7739384 Change-Id: Ie76d6741be4d08f3f9919662f1ad558c809aa5bd
* / / / Added K-Means clustering filter.Ruben Brunk2012-12-133-1/+76
|/ / / | | | | | | | | | Change-Id: If8961d4a21de953b754cf74aefc222b6bec902a3
* | | Added sobel filter for edge function.Ruben Brunk2012-12-122-1/+43
| | | | | | | | | | | | Change-Id: I4d59a96585f4902cd01d26ff68c777b542041132
* | | Added photonegative filter.Ruben Brunk2012-12-125-2/+61
| | | | | | | | | | | | Change-Id: I73594573b26873cb3fda49aca6d40761dec3707f
* | | Merge "remove actionbar sherlock" into gb-ub-photos-bryceJohn Reck2012-12-1216-84/+67
|\ \ \
| * | | remove actionbar sherlockJohn Reck2012-12-1216-84/+67
| | | | | | | | | | | | | | | | Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
* | | | Merge "Remove LongSpareArray + some cleanups" into gb-ub-photos-bryceYour Name2012-12-116-70/+58
|\ \ \ \ | |/ / / |/| | |
| * | | Remove LongSpareArray + some cleanupsYour Name2012-12-116-70/+58
| | | | | | | | | | | | | | | | Change-Id: If5bb44ebca70bd735e426aeb3d9aac2d4bac646e