summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix DataAdapter wrapper classes callback mechanism.Angus Kong2013-08-092-6/+44
| | | | | | Also to fix FilmStripView to avoid NPE before data is loaded. Change-Id: I6c8a3d215d9f1dc72b4207e52023c1e27e9df123
* Merge "Refactor data/LocalData." into gb-ub-photos-carlsbadAngus Kong2013-08-076-713/+764
|\
| * Refactor data/LocalData.Angus Kong2013-08-076-713/+764
| | | | | | | | | | | | Make the design more easily understood. Change-Id: I4f7dbe7d3f0a0534c13996b773f1767997848746
* | Changes required for building GoogleCamera.Sascha Haeberling2013-08-071-5/+37
|/ | | | Change-Id: I2ea7f4714e3003ff05eadb6cb8b93af721b39ac6
* Remove refocus icon if it's not enabled or present.Sascha Haeberling2013-08-061-13/+33
| | | | Change-Id: I0c885a7a56abfe2365d832fa5ca8c1d74ce2edc8
* This adds the following four CLs to Camera2:Sascha Haeberling2013-08-0615-286/+739
| | | | | | | | | | | | http://ag/339319 http://ag/338974 http://ag/338401 http://ag/324149 Adapted to work in Camera2 and adding a .gitignore so that temporary Eclipse files and folders are not submitted. Change-Id: I40295c7f0139f76270c44f0ca395c0574a288569
* This removes all non-Camera stuff from Camera2.Sascha Haeberling2013-08-06512-82252/+948
| | | | | | | Note: Camera2 is a clone of Gallery2 right now. Note 2: I will bring .mk files back later. Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
* Load the FilmStrip data in onCreate()Angus Kong2013-08-051-19/+20
| | | | | | | | The loading should be done in onCreate() so it won't waste time loading the data which has been loaded everytime the app is brought to the foreground. bug:10189998 Change-Id: I5b9158b206f96b065f6f18a5ab7da3ca14b9e52a
* Fix display bug with highresnicolasroard2013-08-022-1/+25
| | | | Change-Id: I8961beca6bf80efdf3cf1c3b6cae691dd0f473ed
* Add quality selector to export.Ruben Brunk2013-08-025-26/+132
| | | | | | | - Adds the option to change the quality of the jpeg compression when flattening an exported bitmap. Change-Id: I252913fc15ff32a0fcff683edb5b33e17b5daac4
* Merge "add Per Channel Saturation" into gb-ub-photos-carlsbadJohn Hoford2013-08-029-3/+773
|\
| * add Per Channel SaturationJohn Hoford2013-08-019-3/+773
| | | | | | | | Change-Id: Icfd24c817674b81ac9caecc2d73348dc7734f037
* | Add LocalDataAdapter and wrappers.Angus Kong2013-08-0110-221/+810
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. FixedFirstDataAdapter wraps another adapter and add a data at the first position. 2. FixedLastDataAdapter wraps another adapter and add a data at the last position. 3. Make the LocalData interface more complete. - onFullScreen() - canSwipeInFullScreen() - getPath() 3. Add methods to the FilmStripView.DataAdapter to receive UI events. - onDataCentered() - onDataFullScreen() Change-Id: I26d3a3b7facd0c451af43ce5fbbcab2baaaec427
* | Merge "Adds back the PhotoSphere View icon in filmstrip." into ↵Sascha Haeberling2013-08-015-130/+541
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Adds back the PhotoSphere View icon in filmstrip.Sascha Haeberling2013-08-015-130/+541
| | | | | | | | | | | | | | | | | | | | | | 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
* | Refactoring Geometry handling.Ruben Brunk2013-08-0138-2759/+1421
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9170644 Bug: 9366654 Bug: 9366263 - Consolidates all the geometry transforms in GeometryMathUtils and significantly reduces complexity. - Removes GeometryMetadata object and dependent code. - Removes ImageGeometry and geometry update callbacks. Change-Id: I59add51907459593244c9ebaadef585efc7486d5
* | Fix problem with N-1 caching when no filters / one filternicolasroard2013-07-317-10/+93
| | | | | | | | | | | | - also fix equals() for geometry Change-Id: I6f6f21d1e274b3b95ac4b5189b2fa7f419912864
* | Merge "Add wrapper for face detection listener." into gb-ub-photos-carlsbadAngus Kong2013-07-314-52/+104
|\ \
| * | Add wrapper for face detection listener.Angus Kong2013-07-314-52/+104
| | | | | | | | | | | | | | | | | | bug:10113532 Change-Id: I01dc051d7b25cb97153b5e3e4cf06744dccb9fd4
* | | Merge "Implements N-1 Caching" into gb-ub-photos-carlsbadnicolasroard2013-07-314-1/+209
|\ \ \
| * | | Implements N-1 Cachingnicolasroard2013-07-314-1/+209
| |/ / | | | | | | | | | Change-Id: Ief1a04dbe4f6ced15f937177a556733cfcdb5879
* / / Set default video quality to the highestDoris Liu2013-07-312-51/+26
|/ / | | | | | | | | | | Bug: 9886141 Change-Id: I4741d5c898ac666923cfc12abc78d5d3517cb05f
* | Fix switching camera failure.Angus Kong2013-07-311-1/+1
| | | | | | | | | | | | bug:10110830 Change-Id: I1adcefc229ce4a245880bc037a086c949c73da55
* | Merge "Do antialiasing on wallpaper preview." into gb-ub-photos-carlsbadRuben Brunk2013-07-311-0/+2
|\ \ | |/ |/|
| * Do antialiasing on wallpaper preview.Ruben Brunk2013-07-301-0/+2
| | | | | | | | | | Bug: 9052851 Change-Id: I890fae2d4bb9907c7204cc6fa34c42c7fe7c7309
* | Merge "clean up some bugs and update the icons" into gb-ub-photos-carlsbadJohn Hoford2013-07-304-66/+26
|\ \ | |/ |/|
| * clean up some bugs and update the iconsJohn Hoford2013-07-304-66/+26
| | | | | | | | Change-Id: I6952bae8cfea2ec64064f3126eece93687c02eae
* | Add user presets saving/loadingnicolasroard2013-07-3012-20/+658
|/ | | | Change-Id: I85c5dd0df1e9264a01c8d7a6d44602e87799890c
* Merge "add Grad filter" into gb-ub-photos-carlsbadJohn Hoford2013-07-309-0/+1683
|\
| * add Grad filterJohn Hoford2013-07-299-0/+1683
| | | | | | | | Change-Id: I30fc0810c54f3daa31726188a4c3762df33953a7
* | Refactor CameraManager.Angus Kong2013-07-298-476/+1071
| | | | | | | | | | | | | | | | | | | | | | | | 1. CameraManager should be the only class accessing android.hardware.Camera. 2. For potential future upgrade in Camera HAL and android.hardward.Camera API upgrade, CameraManager should be just an interface instead of concrete implementation. 3. waitDone() in CameraProxy is removed. 4. ShutterCallback, PreviewCallback, PictureCallback and AF Callbacks are wrapped by our own interfaces. Change-Id: I595da17a1a9c6d476ee805b71c7f45ebb609e465
* | Merge "Refocus integration phase 1." into gb-ub-photos-carlsbadSascha Haeberling2013-07-272-1/+11
|\ \
| * | Refocus integration phase 1.Sascha Haeberling2013-07-242-1/+11
| | | | | | | | | | | | | | | | | | Bug: 9966846 Change-Id: I591ce1ee878a9f4d6bd63eddef6e79608ffd69ec
* | | Fix disappearing fragmentnicolasroard2013-07-261-0/+1
| |/ |/| | | | | Change-Id: Ic478ad75a458bb36001c91f8627aab7643fa0a47
* | Fix geometry serializationnicolasroard2013-07-261-15/+0
| | | | | | | | Change-Id: I3040cfdb08f6cc6dbd4fd1eb5444b3395a68c7da
* | Added support to export to a flattened photo.Ruben Brunk2013-07-254-19/+35
|/ | | | | | | | | | 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
* Remove legacy code ActivityBase.java.Angus Kong2013-07-243-646/+28
| | | | Change-Id: I7b372e5d69c3d01b4012ab61bbf725a7fec8a445
* Fix geometry transformnicolasroard2013-07-231-6/+1
| | | | Change-Id: I0c3af6f4122d045f5a8656bc709127aa7ae2ecab
* Merge "Move ImageCurves to the ImageShow package" into gb-ub-photos-carlsbadnicolasroard2013-07-227-10/+8
|\
| * Move ImageCurves to the ImageShow packagenicolasroard2013-07-227-10/+8
| | | | | | | | Change-Id: I458d20df930b9228dcbc60c3ec27f74b152d38cf
* | Fix saving issues with online image.ztenghui2013-07-221-11/+22
|/ | | | | | bug:9468909 Change-Id: I10762dba307999d87fac08b3a2ce7e104264a813
* Merge "Remove FilteringPipeline" into gb-ub-photos-carlsbadnicolasroard2013-07-1911-264/+356
|\
| * Remove FilteringPipelinenicolasroard2013-07-1911-264/+356
| | | | | | | | | | | | | | | | | | Reorganize things around the filtering service. - add HighresRenderingTask - add RenderingRequestTask - add UpdatePreviewTask Change-Id: I3da34fee8c624fb55311c3e1639857fc1bcdadad
* | Merge "Update Uri instead of removing" into gb-ub-photos-carlsbadztenghui2013-07-195-72/+59
|\ \
| * | Update Uri instead of removingztenghui2013-07-195-72/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | In this way, the processing service can have a better presentation. The cache key now include the file Uri and local abs path if exists. bug:9468909 Change-Id: I0919c09ad26bea2e798c99ad376996547f8f2bf8
* | | Add stitching manager in Camera.Angus Kong2013-07-172-1/+74
| | | | | | | | | | | | Change-Id: I2f27c2c0e77ed3d618df890e709ca09076591f70
* | | Refine MediaSaveService to use memory limit.Angus Kong2013-07-171-10/+18
| | | | | | | | | | | | Change-Id: Ieeb06eddbd742896ecb7c50f0f51facaa77b2d21
* | | Refactoring GeometryMetadata.Ruben Brunk2013-07-1712-280/+755
|/ / | | | | | | | | | | | | | | | | | | Bug: 9170644 - First part of multi-step refactor, splits GeometryMetadata functionality into 4 FilterRepresentation subclasses as requested. Change-Id: I212193db8c154f64c550adb9735c0502bcaa7468
* | remove cloneJohn Hoford2013-07-1716-95/+143
| | | | | | | | Change-Id: Ia9f4c1778e06416018eeb07be657bcdd0af1496b
* | Fix help for GalleryGoogle buildsJohn Reck2013-07-172-107/+1
|/ | | | | | Bug: 9886976 Change-Id: I23fc78b924f3757f8ab12f84d3a0c97c1adc2333 (cherry picked from commit 7a43c8c3b85d6f9162651d8ed8b3a11a87490824)