summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Add quality selector to export.Ruben Brunk2013-08-022-0/+84
| | | | | | | - Adds the option to change the quality of the jpeg compression when flattening an exported bitmap. Change-Id: I252913fc15ff32a0fcff683edb5b33e17b5daac4
* Hide "View Photo Sphere" button by default.Sascha Haeberling2013-08-011-0/+1
| | | | Change-Id: Idb31a96d0dcb19e6d57c1c5d388ef8d180382345
* Merge "add Per Channel Saturation" into gb-ub-photos-carlsbadJohn Hoford2013-08-023-1/+58
|\
| * add Per Channel SaturationJohn Hoford2013-08-013-1/+58
| | | | | | | | Change-Id: Icfd24c817674b81ac9caecc2d73348dc7734f037
* | Merge "Adds back the PhotoSphere View icon in filmstrip." into ↵Sascha Haeberling2013-08-011-5/+25
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Adds back the PhotoSphere View icon in filmstrip.Sascha Haeberling2013-08-011-5/+25
| | | | | | | | | | | | | | | | | | | | | | This also exercises the "leave a place cleaner than you found it" rule by cleaning up stuff: - Formatting according to the Android format rules - Removing unused code - Putting braces where they belong. Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931
* | Set default video quality to the highestDoris Liu2013-07-311-1/+0
|/ | | | | | Bug: 9886141 Change-Id: I4741d5c898ac666923cfc12abc78d5d3517cb05f
* Merge "clean up some bugs and update the icons" into gb-ub-photos-carlsbadJohn Hoford2013-07-304-1/+1
|\
| * clean up some bugs and update the iconsJohn Hoford2013-07-304-1/+1
| | | | | | | | Change-Id: I6952bae8cfea2ec64064f3126eece93687c02eae
* | Add user presets saving/loadingnicolasroard2013-07-304-0/+129
|/ | | | Change-Id: I85c5dd0df1e9264a01c8d7a6d44602e87799890c
* Merge "add Grad filter" into gb-ub-photos-carlsbadJohn Hoford2013-07-3017-0/+159
|\
| * add Grad filterJohn Hoford2013-07-2917-0/+159
| | | | | | | | Change-Id: I30fc0810c54f3daa31726188a4c3762df33953a7
* | Merge "Refocus integration phase 1." into gb-ub-photos-carlsbadSascha Haeberling2013-07-272-0/+2
|\ \ | |/ |/|
| * Refocus integration phase 1.Sascha Haeberling2013-07-242-0/+2
| | | | | | | | | | | | Bug: 9966846 Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
* | Added support to export to a flattened photo.Ruben Brunk2013-07-252-0/+8
|/ | | | | | | | | | Bug: 10008212 - Adds a menu item to allow a photo with edits to be flattened into a separate photo. - Fixes bug where crop intents fail to save cropped images. Change-Id: I1dcf1bb9ba22e72378f24e7971a74f81b8db7564
* Fix help for GalleryGoogle buildsJohn Reck2013-07-171-3/+0
| | | | | | Bug: 9886976 Change-Id: I23fc78b924f3757f8ab12f84d3a0c97c1adc2333 (cherry picked from commit 7a43c8c3b85d6f9162651d8ed8b3a11a87490824)
* Add background processing servicenicolasroard2013-07-161-0/+5
| | | | | | bug:7298624 Change-Id: Ie79f88fd84fdf8f4dab6a8071f06a819e247b357
* Remove FilterIconButtonnicolasroard2013-07-031-18/+0
| | | | Change-Id: Ie1d7c4e8d3f397323f702eba2809f2589b8071f0
* Improves portrait categories buttonsnicolasroard2013-07-023-0/+19
| | | | | | | | | - use only CategoryView, no FilterIconButton - add xml values for the font size/margins - for now reuse the same Action bitmap - add accessibility contentDescription Change-Id: Ic1ae8015abba27bea0b3c4a2bccbd1a7c9ff4731
* Clean up camera switcherDoris Liu2013-06-243-0/+0
| | | | Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
* Merge "Remove SRI panorama" into gb-ub-photos-carlsbadDoris Liu2013-06-219-456/+0
|\
| * Remove SRI panoramaDoris Liu2013-06-209-456/+0
| | | | | | | | Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
* | Add flash animation to photo moduleDoris Liu2013-06-191-0/+7
|/ | | | Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652
* Switch over to use new camera activityDoris Liu2013-06-186-167/+40
| | | | Change-Id: Ib907b5ab5d0e818261e95edd182f2e20c3bbebe0
* Fix icon sizes and jaggiesnicolasroard2013-06-114-2/+19
| | | | | | bug:9105608 bug:8791729 Change-Id: I828e9d4daf4025f53d505a3412c27dd8c54a607e
* Fix text size in the state panelnicolasroard2013-06-101-0/+4
| | | | Change-Id: I0290b2039d987605e3cc82e3c4d486b7855059b2
* Add a layout for undo barDoris Liu2013-06-053-2/+65
| | | | Change-Id: Id795f00c8ca5f147f6aae8c1f9cba4e1da1e5b20
* Remove the frameLayout wrapping CameraRootViewDoris Liu2013-06-041-10/+4
| | | | Change-Id: I5a238766b54d3f36c929c53225367cddf90473f9
* Add secure camera support.Angus Kong2013-06-031-0/+23
| | | | Change-Id: I672d76cb4de37c46394a5e8ee2899cf571158a2c
* Improve gesture handlingDoris Liu2013-05-312-0/+2
| | | | Change-Id: Ib1e18274480b6bb681bd06f3130f9b9ea198ea98
* am af65d7ba: Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-302-0/+8
|\ | | | | | | | | * commit 'af65d7ba216eba60651d11d248d20346309375ed': Add HTC One picture resolutions
| * Merge "Add HTC One picture resolutions" into gb-ub-photos-bryceMichael Kolb2013-05-302-0/+8
| |\
| | * Add HTC One picture resolutionsMichael Kolb2013-05-302-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 9175168 Fixes bug where preview is not stopped before size changes Change-Id: I2df136482df68a952c9d3ca5c058ba56ff3a6db8
| * | Import translations. DO NOT MERGEBaligh Uddin2013-05-2749-0/+79
| |/ | | | | | | | | Change-Id: I6d43e9331dd993de57921360e33c36a58c355056 Auto-generated-cl: translation import
* | Cleaning up ImageShow.Ruben Brunk2013-05-292-59/+49
| | | | | | | | | | Bug: 9170644 Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690
* | Add UI for insertion in FilmStripView.Angus Kong2013-05-281-0/+1
| | | | | | | | Change-Id: Iff389525e3811c5018365b6e6c3b9f8b95b9da9a
* | am 461e101f: Add 13MP resolutionMichael Kolb2013-05-242-0/+4
|\| | | | | | | | | * commit '461e101fb99df1a704544efb29e56ece25788985': Add 13MP resolution
| * Add 13MP resolutionMichael Kolb2013-05-242-0/+4
| | | | | | | | | | | | Bug: 9059351 Change-Id: I40c2c94ccc54399f6928d9e8a66abca0df15fea3
| * Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryceBaligh Uddin2013-05-171-6/+6
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2013-05-171-6/+6
| | | | | | | | | | | | | | | Change-Id: I5a5fee30a1f76b360c7ffca2ffec7592a66d7e52 Auto-generated-cl: translation import
* | | Merge "Make preview size smaller so that low-res images come in faster." ↵George Mount2013-05-211-1/+1
|\ \ \ | | | | | | | | | | | | into gb-ub-photos-carlsbad
| * | | Make preview size smaller so that low-res images come in faster.George Mount2013-05-211-1/+1
| | | | | | | | | | | | | | | | Change-Id: I82fea176a2aa8b0a3abfd829c0ec2d16f267ef5b
* | | | am 1a266f16: Highlight selected option in FX and BordersMichael Kolb2013-05-171-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '1a266f16edbef7cb0a770d37fcad958fc55a5862': Highlight selected option in FX and Borders
| * | | Highlight selected option in FX and BordersMichael Kolb2013-05-171-0/+1
| | |/ | |/| | | | | | | | | | | | | Bug: 8791729 Change-Id: I8ac2c3deabe7b293df48db9f44f52956443a92a4
* | | Merge "Add new camera activity back and fix build errors" into ↵Doris Liu2013-05-164-0/+144
|\ \ \ | |_|/ |/| | | | | gb-ub-photos-carlsbad
| * | Add new camera activity back and fix build errorsDoris Liu2013-05-164-0/+144
| | | | | | | | | | | | Change-Id: I30b657c7eee2b8cb0317c922966821002ea956f0
* | | am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into ↵Michael Kolb2013-05-168-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | gb-ub-photos-bryce * commit '5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca': Add new overlay icons for sharpen and curves
| * | Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryceMichael Kolb2013-05-168-0/+0
| |\ \
| | * | Add new overlay icons for sharpen and curvesMichael Kolb2013-05-168-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8791729 Change-Id: Ife86e0a22fb270df2f2f0a699f103ece5e9e9f1b
* | | | am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryceJohn Reck2013-05-162-2/+4
|\| | | | | | | | | | | | | | | | | | | * commit '75084da1b34e0ff9f269b5409d206c213532edbc': toUpper() some strings