summaryrefslogtreecommitdiffstats
path: root/src/com
Commit message (Collapse)AuthorAgeFilesLines
* Support for save state in imagesJohn Hoford2013-04-1732-31/+585
| | | | | | bug:8626775 Change-Id: I2a34a6027b23dab9c1802f672bfbf399cac0c4f7
* am 113e0fbd: Merge "Shows final set of filters in UI." into gb-ub-photos-bryceRuben Brunk2013-04-161-4/+4
|\ | | | | | | | | * commit '113e0fbd251966629719f390e43b320b84751304': Shows final set of filters in UI.
| * Merge "Shows final set of filters in UI." into gb-ub-photos-bryceRuben Brunk2013-04-161-4/+4
| |\
| | * Shows final set of filters in UI.Ruben Brunk2013-04-161-4/+4
| | | | | | | | | | | | | | | Bug: 8609003 Change-Id: Id7530da3e11fb88a964b881ba8f8fad70b40bc23
* | | Re-enable Simple Editor menu itemnicolasroard2013-04-161-1/+1
| | | | | | | | | | | | Change-Id: I080dfffeb6394b78a1dc2bd10b52ff15b1e55ac9
* | | am 953f109b: Merge "Fix face unlock failure" into gb-ub-photos-bryceDoris Liu2013-04-161-2/+2
|\| | | | | | | | | | | | | | * commit '953f109b688477b086281fe09074d3886ef87fba': Fix face unlock failure
| * | Merge "Fix face unlock failure" into gb-ub-photos-bryceDoris Liu2013-04-161-2/+2
| |\ \
| | * | Fix face unlock failureDoris Liu2013-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | Bug: 7494156 Change-Id: I6c909e498305ff3e66efdeeb9fb5581ea8f51715
| * | | Make convertBitmap() protected so that Frames can use it.nicolasroard2013-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | bug:8633011 Change-Id: Ic731a1d906a6a388a22568f396111f8ca3b4475e
* | | | Merge "Add accessibility to video player controller." into gb-ub-photos-carlsbadztenghui2013-04-161-5/+18
|\ \ \ \
| * | | | Add accessibility to video player controller.ztenghui2013-04-161-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5714277 Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
* | | | | am f3f0aae4: Merge "Remove the Simple Edit menu item in Gallery" into ↵nicolasroard2013-04-161-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce * commit 'f3f0aae490911245ad6a5602b77b72f0546b93cc': Remove the Simple Edit menu item in Gallery
| * | | | Merge "Remove the Simple Edit menu item in Gallery" into gb-ub-photos-brycenicolasroard2013-04-161-1/+1
| |\ \ \ \
| | * | | | Remove the Simple Edit menu item in Gallerynicolasroard2013-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:8609003 Change-Id: Ida6bfec65bf4b78c7c1b64f759c750ef9255bb6c
* | | | | | am bc02d7dc: Don\'t wait for Mosaic Renderer ready in UI thread.Angus Kong2013-04-161-12/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bc02d7dcb2e9716a1f1e297fef435c8b0275aafe': Don't wait for Mosaic Renderer ready in UI thread.
| * | | | | Don't wait for Mosaic Renderer ready in UI thread.Angus Kong2013-04-161-12/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | bug:8292711 Change-Id: Ic318c353fc420c0f7e573c74814757b79c798c5d
* | | | | am fb6a8e16: New state panelnicolasroard2013-04-1611-42/+946
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'fb6a8e166f0a46d2a994a408b1679e3a67fdcb52': New state panel
| * | | | New state panelnicolasroard2013-04-1511-42/+946
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:8620913 bug:8503386 Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
* | | | | convertBitmap is needed by ImageFilterFixedFrame.Christian Wichner2013-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2094c54745f94dab2283e2a466371d15d5a57b0a
* | | | | Add local database for filters.Ruben Brunk2013-04-152-0/+244
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8621039 Change-Id: I7b13ff0167483f148b354204cb01262fe40da2ba
* | | | | am 0786c387: Merge "Angle menu at edge of screen" into gb-ub-photos-bryceMichael Kolb2013-04-151-6/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '0786c387413d434438257697475cf743661df296': Angle menu at edge of screen
| * | | | Merge "Angle menu at edge of screen" into gb-ub-photos-bryceMichael Kolb2013-04-161-6/+34
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Angle menu at edge of screenMichael Kolb2013-04-151-6/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8618699 Adjust touch slices; adjust label position Change-Id: I5bbf16fc570eb9801198847991395699de89ffa3
* | | | | am f7771f98: Use extra copy of parameters for concurrent accessAngus Kong2013-04-155-25/+19
|\| | | | | |_|/ / |/| | | | | | | | | | | * commit 'f7771f98aed9f253048af7dd8b2a143b9258c139': Use extra copy of parameters for concurrent access
| * | | Use extra copy of parameters for concurrent accessAngus Kong2013-04-155-25/+19
| | | | | | | | | | | | | | | | | | | | bug:8585306 Change-Id: I21b8915c53508e4820e46b49171149189cb6012e
* | | | am 78991864: Merge "Also, add labels to video menu" into gb-ub-photos-bryceMichael Kolb2013-04-151-0/+5
|\| | | | | | | | | | | | | | | | | | | * commit '789918643e2b682e387435002b5b0c287f35b39b': Also, add labels to video menu
| * | | Also, add labels to video menuMichael Kolb2013-04-151-0/+5
| |/ / | | | | | | | | | | | | | | | Bug: 8618169 Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c
* | | am ad30f960: Merge "Add menu labels" into gb-ub-photos-bryceMichael Kolb2013-04-157-4/+85
|\| | | | | | | | | | | | | | * commit 'ad30f960879285c4dadb10d5b7531e05c345587f': Add menu labels
| * | Merge "Add menu labels" into gb-ub-photos-bryceMichael Kolb2013-04-157-4/+85
| |\ \
| | * | Add menu labelsMichael Kolb2013-04-157-4/+85
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8618169 Change-Id: Iea1ac7256450afd2870c144099459f32868c699f
* | | | am 3dc6a630: Merge "Fix performance and other issues related to ↵Bobby Georgescu2013-04-152-25/+68
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | multi-selection" into gb-ub-photos-bryce * commit '3dc6a630aff5be323c54b4616fd3a373cbad31f7': Fix performance and other issues related to multi-selection
| * | | Merge "Fix performance and other issues related to multi-selection" into ↵Bobby Georgescu2013-04-152-25/+68
| |\ \ \ | | | | | | | | | | | | | | | gb-ub-photos-bryce
| | * | | Fix performance and other issues related to multi-selectionBobby Georgescu2013-04-122-25/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8606565 Bug: 8607510 Change-Id: I5bd01745b6d1047571d562e1637a2999afddfec2
* | | | | am d2f5fe60: support for simplified parameters in filterJohn Hoford2013-04-157-0/+296
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'd2f5fe607ee6d7b5f79862b495495e2f6024cdab': support for simplified parameters in filter
| * | | | support for simplified parameters in filterJohn Hoford2013-04-157-0/+296
| | |/ / | |/| | | | | | | | | | Change-Id: I623e6fb90e8175c7e5e2dfc146f927eecba29817
* | | | am 4b6ea5bc: Add direct rendering for bordernicolasroard2013-04-132-0/+17
|\| | | | | | | | | | | | | | | | | | | * commit '4b6ea5bce9b68eea16eb8a0980501f671e7fbf44': Add direct rendering for border
| * | | Add direct rendering for bordernicolasroard2013-04-122-0/+17
| |/ / | | | | | | | | | | | | | | | bug:8603245 Change-Id: Ibc1bde9adb19f930b474e4076a0c2720fbe0bc8d
* / / Load video items in the new camera filmstrip.Angus Kong2013-04-122-34/+214
|/ / | | | | | | | | | | | | | | | | Also fixes: 1. NPE when no data to load. 2. The last item is skipped. 3. date and id should be long instead of int. Change-Id: I7cad06998d78e0d3f0a30be24e65eb0f777b9c0e
* | Add a direct rendering modenicolasroard2013-04-125-0/+106
| | | | | | | | | | | | | | | | | | | | | | This takes input and output allocations. Also added a utility method in ImageFilterRS to scale textures at screen resolution. bug:8603245 bug:8588853 Change-Id: Ic5e4dea2289f0edd7518fc07f04b523be5316e82
* | Merge "Add checks for NPE in video pie menu." into gb-ub-photos-bryceMichael Kolb2013-04-121-22/+31
|\ \
| * | Add checks for NPE in video pie menu.Jason Noguchi2013-04-111-22/+31
| | | | | | | | | | | | | | | | | | Bug: 8536361 Change-Id: Iabd818e4e9fadf1f36ffed894ca7248f9568e6c9
* | | Merge "Fix NPE in PieRenderer" into gb-ub-photos-bryceMichael Kolb2013-04-121-1/+1
|\ \ \
| * | | Fix NPE in PieRendererMichael Kolb2013-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8579025 Change-Id: I1faaa4fc8a48e6abedca303e80dbf48d7b5e7574
* | | | Merge "Fix ICS recording aspect ratio" into gb-ub-photos-bryceDoris Liu2013-04-121-19/+27
|\ \ \ \
| * | | | Fix ICS recording aspect ratioDoris Liu2013-04-111-19/+27
| | |/ / | |/| | | | | | | | | | Change-Id: I092a4303959b1b3cee870c891070e2605ab9e0b0
* | | | G+ crop overlay shadows. Aspect ratios.Ruben Brunk2013-04-113-3/+13
| |_|/ |/| | | | | | | | | | | | | | Bug: 8597538 Change-Id: I9a7225a125bef7e11d6bf420bf1fa55e7f22c909
* | | Merge "Show loading indicator in full-screen importer view" into ↵Bobby Georgescu2013-04-111-0/+3
|\ \ \ | | | | | | | | | | | | gb-ub-photos-bryce
| * | | Show loading indicator in full-screen importer viewBobby Georgescu2013-04-111-0/+3
| | | | | | | | | | | | | | | | | | | | Bug: 8599282 Change-Id: I568d5077e8e5450da49cd4d75df39973b84d081f
* | | | Merge "Integrate FilmStripView." into gb-ub-photos-bryceAngus Kong2013-04-115-52/+201
|\ \ \ \ | |/ / / |/| | |
| * | | Integrate FilmStripView.Angus Kong2013-04-115-52/+201
| | | | | | | | | | | | | | | | Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d