summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-174-7/+74
|\ \ | | | | | | | | | gb-ub-photos-bryce
| * | Move LightCycle to render directly to GLRootView.George Mount2012-12-174-7/+74
| | | | | | | | | | | | 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-1296-30584/+67
|\ \
| * | remove actionbar sherlockJohn Reck2012-12-1296-30584/+67
| | | | | | | | | | | | Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
* | | Merge "Remove LongSpareArray + some cleanups" into gb-ub-photos-bryceYour Name2012-12-117-438/+58
|\ \ \ | |/ / |/| |
| * | Remove LongSpareArray + some cleanupsYour Name2012-12-117-438/+58
| | | | | | | | | | | | Change-Id: If5bb44ebca70bd735e426aeb3d9aac2d4bac646e
* | | Merge "GL packaging refactor" into gb-ub-photos-bryceJohn Reck2012-12-1166-77/+180
|\ \ \
| * | | GL packaging refactorJohn Reck2012-12-1166-77/+180
| |/ / | | | | | | | | | Change-Id: I1d7a95c4f0b91a5ba59030d57cf6865c11b497aa
* / / Cleanup filters creation in presetsnicolasroard2012-12-113-52/+23
|/ / | | | | | | | | | | bug:7688780 Change-Id: If330d02e3c0f43cffbce5327b26f0af44d2416c8
* | am 695e1aa0: Force a layout pass if the display rotation changesJohn Reck2012-12-101-1/+5
|\| | | | | | | | | * commit '695e1aa059cbc2cb2988f6beb0fee8ff7952b229': Force a layout pass if the display rotation changes
| * Force a layout pass if the display rotation changesJohn Reck2012-12-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7687209 DisplayRotation is used to map camera orientation to the display and is updated in layoutContentPane(). However, in the case of a 180 rotate framework doesn't send an onConfigurationChanged nor does the layout dimensions change, thus layoutContentPane doesn't fire and we don't update mDisplayRotation, resulting in an upside-down preview. To handle this, check each draw whether or not the display rotation has changed and if it has force a layout pass. Change-Id: I610ea235d1bf7de2743f4cdb8e42ba1ddcb41404
* | More refactoring...nicolasroard2012-12-077-93/+77
| | | | | | | | | | | | | | Simplify management of filters in PanelController bug:7688780 Change-Id: I0d07711cb2be127f064d476c6e98f4363b69b06c
* | Merge "More refactoring. Makes it easy to specify how the button should look ↵nicolasroard2012-12-075-91/+48
|\ \ | | | | | | | | | like (overlay img or not)." into gb-ub-photos-bryce
| * | More refactoring. Makes it easy to specifynicolasroard2012-12-075-91/+48
| | | | | | | | | | | | | | | | | | | | | how the button should look like (overlay img or not). bug:7688780 Change-Id: If883c6886ade409dac7d72c87a514bd3fcd3ad7f
* | | Decode screenshots when they show 0x0 dimensionsDoris Liu2012-12-072-1/+57
|/ / | | | | | | | | Bug: 7470758 Change-Id: If4012899e120ad68cdc8ca12bf6f8de8c5c96019
* | Refactor filters to simplify their creation/additionnicolasroard2012-12-0614-32/+155
| | | | | | | | | | Bug:7688780 Change-Id: I9e1bb860dc9150bed4a255118654f2ca7f1ec3f0
* | Fixed Autocolor not getting saved.Ruben Brunk2012-12-061-0/+5
| | | | | | | | | | Bug: 7541348 Change-Id: Ie62aa8abec78441ae0e42cb4069ddbd7d2f3e199
* | Removed old crop.Ruben Brunk2012-12-0612-1862/+29
| | | | | | | | | | Bug: 7441237 Change-Id: I29801f798a1d1ad3af81a82950edbb8a72ccae82
* | Added support for Crop extras. Wallpaper & Widget use editor crop.Ruben Brunk2012-12-0612-68/+597
| | | | | | | | | | | | Bug: 7561976 Bug: 7441237 Change-Id: I0d6644171177650568ed911fc63c0c7e104f8d8c
* | Implements Redeye fixnicolasroard2012-12-057-19/+344
| | | | | | | | | | bug:7223838 Change-Id: I21d8d2c8f858fca2e86d18b927cbf6878eb64263
* | Merge "Add GLES20 canvas implementation." into gb-ub-photos-bryceGeorge Mount2012-12-0512-69/+1218
|\ \
| * | Add GLES20 canvas implementation.George Mount2012-12-0512-69/+1218
| | | | | | | | | | | | Change-Id: I5680909f31dc097599d0e063aa1f6daba834d3e2
* | | am db99a10b: Fix NPE in PhotoPageBobby Georgescu2012-12-051-1/+3
|\ \ \ | | |/ | |/| | | | | | | * commit 'db99a10b6ac9296d612db8ba51e37f141fee4170': Fix NPE in PhotoPage
| * | Fix NPE in PhotoPageBobby Georgescu2012-12-041-1/+3
| | | | | | | | | | | | | | | Bug: 7673141 Change-Id: I264f28d127f47e5f4f8c6a7c2df1c021401d03f2
* | | am 870e62ac: Handle the case where the orientation column is not here...nicolasroard2012-12-041-0/+2
|\| | | | | | | | | | | | | | * commit '870e62ac801064f83bffc9095cbaee5fe46bdd80': Handle the case where the orientation column is not here...
| * | Handle the case where the orientation column is not here...nicolasroard2012-12-041-0/+2
| | | | | | | | | | | | | | | bug:7537610 Change-Id: I4f64891a789358c20206aea3033fd17514199d62
* | | am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-archesMichael Kolb2012-12-041-1/+3
|\| | | | | | | | | | | | | | * commit '7a5377322dcebdaad98df9a31cadc7ff0f464d8a': Prevent Camera UI in Gallery
| * | Prevent Camera UI in GalleryMichael Kolb2012-12-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7668856 At startup, the PhotoView wouldn't execute the onFullScreenChanged callback, so the Camera UI believed it was in Camera. Change-Id: I6794c2a5a4eb06d39161a681b7a0afc27d5e4b3f
* | | Merge "Fix call to Toast outside UI thread." into gb-ub-photos-bryceRuben Brunk2012-12-032-71/+93
|\ \ \
| * | | Fix call to Toast outside UI thread.Ruben Brunk2012-12-032-71/+93
| | |/ | |/| | | | | | | | | | Bug: 7412281 Change-Id: I976ccd28f696a65a1159b6a092b8aa2f2a2d0e08
* / | Move MenuExecutor operations into ServiceBobby Georgescu2012-12-036-8/+110
|/ / | | | | | | | | Bug: 6680729 Change-Id: I538bb0a8783f7c1ff467ba8d8eb0deefdc0b6ea2