summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBaligh Uddin2013-01-1448-195/+51
| | | | | Change-Id: Ia46ffed829d3290ad59bd4f33f20efd4810860f4 Auto-generated-cl: translation import
* 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-1116-606/+616
|/ | | | | | | Bug: 7875246 Bug: 7459118 Change-Id: Ic1099a7ae0feeeb16c8be3035f9726805149666e
* Merge "Fix slide show animation so that cross fades work." into ↵George Mount2013-01-095-130/+52
|\ | | | | | | gb-ub-photos-bryce
| * Fix slide show animation so that cross fades work.George Mount2013-01-095-130/+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
* | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-01-0948-0/+192
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-01-0948-0/+192
| | | | | | | | | | | | | | | Change-Id: If0150dc371afd98cb5512a5f29c51d5554b99008 Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-01-0949-0/+637
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-01-0949-0/+637
| |/ / | | | | | | | | | | | | Change-Id: I1a2f3a5e9c081b2e19de1188b805da3f7c1ba216 Auto-generated-cl: translation import
* / / Refactor filters managementnicolasroard2013-01-096-120/+59
|/ / | | | | | | Change-Id: I0e75ad534cf8cc74a132f97836eedd35baeebeae
* | Add the Drama filterJohn Hoford2013-01-085-0/+76
| | | | | | | | Change-Id: I6f026f899b9d991bd6f9e74445f68114041fe781
* | Merge "Add a Draw filter" into gb-ub-photos-bryceJohn Hoford2013-01-086-0/+438
|\ \
| * | Add a Draw filterJohn Hoford2013-01-086-0/+438
| |/ | | | | | | Change-Id: I67aecc9241b4534491fb838b84d0da1a6edbbb54
* | Merge "Refactoring UI editors" into gb-ub-photos-brycenicolasroard2013-01-089-181/+275
|\ \ | |/ |/|
| * Refactoring UI editorsnicolasroard2013-01-089-181/+275
| | | | | | | | | | bug:7688780 Change-Id: I30f8691788332a01d591435474a84cc352b71138
* | Merge "Instantiate GLCanvas rather than reinitialize current GLCanvas." into ↵George Mount2013-01-0814-196/+165
|\ \ | |/ |/| | | gb-ub-photos-bryce
| * Instantiate GLCanvas rather than reinitialize current GLCanvas.George Mount2013-01-0814-196/+165
| | | | | | | | | | | | | | GLCanvas was being used as a singleton when it really should allow separate instances for correctness. Change-Id: I650884e843a4a78997b70826f6012ae19b8df549
* | Replace camera importerBobby Georgescu2013-01-0735-941/+2005
| | | | | | | | 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
* | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-01-0248-308/+154
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-01-0248-308/+154
| | | | | | | | | | | | | | | Change-Id: Ia064f134f9ec6404207ccb9d2852681c4f5f1bbe Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2013-01-022-2/+2
|/ / | | | | | | | | Change-Id: I21443ea53d6766eb093262f61c01c145d20e9b6a Auto-generated-cl: translation import
* / 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
* Merge "Change XML character limit for string." into gb-ub-photos-bryceRuben Brunk2012-12-191-1/+1
|\
| * Change XML character limit for string.Ruben Brunk2012-12-171-1/+1
| | | | | | | | | | Bug: 7875246 Change-Id: I883fd175db85efcacfae32c6c690480c8f3c7484
* | add javadoc for ExifOutputStreamEarl Ou2012-12-191-0/+51
| | | | | | | | Change-Id: Ib7aa3e32e0ae3af143209c0128374fc35ee8faa2
* | add help function to decode user comment in ExifDataEarl Ou2012-12-191-1/+48
| | | | | | | | Change-Id: Ida19ce45bfc8b00972e751b652d99f6b19798116
* | add javadoc for Rational and IfdId in Exif packageEarl Ou2012-12-192-1/+16
| | | | | | | | Change-Id: Ie67dde198337e6edae2e94d5c7e97b9b6063833e
* | Replace original tags when add tags in ExifTagEarl Ou2012-12-191-20/+12
| | | | | | | | Change-Id: I80d1507467dcde8c8b157a120cfe9a5f5c664d0f
* | 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
* | | Merge "ExifModifier" into gb-ub-photos-bryceAngus Kong2012-12-189-49/+483
|\| |
| * | ExifModifierEarl Ou2012-11-309-49/+483
| | | | | | | | | | | | Change-Id: I001b24d8ba004a4080cd898f0d26d706b1839425
* | | 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-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-173-34/+114
| |_|_|/ |/| | | | | | | | | | | | | | | 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 "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2012-12-1448-57/+211
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2012-12-1448-57/+211
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ief7fd6315479227b744f9dc8a4c93d5d1f8094bf Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBaligh Uddin2012-12-146-7/+7
|/ / / / | | | | | | | | | | | | | | | | Change-Id: Ie43a18a662cb75c76dcfb807ab9686388fd4e36c Auto-generated-cl: translation import
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 04:32:46 +0000