summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Gallery crop uses new activity. Fixed image quality.Ruben Brunk2013-04-186-251/+648
| | | | | | | | | | | | Bug: 8639287 Bug: 8617799 Bug: 8600483 Bug: 8586301 Bug: 8526929 Bug: 8181859 Bug: 7561681 Change-Id: Ib275b970931dd324e93d1629be75e5309c9dcb4e
* Merge "Usage statistics for sharing." into gb-ub-photos-bryceFlavio Lerda2013-04-183-3/+36
|\
| * Usage statistics for sharing.Flavio Lerda2013-04-173-3/+36
| | | | | | | | | | Bug: 8433834 Change-Id: Iaec6150443258daa213395b6fb1e8d8d3e6123b3
* | Remove call to superclass onTouch in curves.Ruben Brunk2013-04-171-2/+0
| | | | | | | | | | Bug: 8523301 Change-Id: I0102a228c2d1b3199412c9897a9f1abdb4bcb41f
* | Merge "Remove redeye filter." into gb-ub-photos-bryceRuben Brunk2013-04-181-2/+2
|\ \
| * | Remove redeye filter.Ruben Brunk2013-04-171-2/+2
| | | | | | | | | | | | | | | Bug: 8609003 Change-Id: I7f10e928fa775e5186146f06877dda34b3df699a
* | | Merge "Add method for returning SoundPool audio type." into gb-ub-photos-bryceSascha Haeberling2013-04-181-3/+6
|\ \ \ | |/ / |/| |
| * | Add method for returning SoundPool audio type.Sascha Haeberling2013-04-171-3/+6
| | | | | | | | | | | | | | | | | | Bug: 7402245 Change-Id: Ib45ef78265a66d59f0b27473d9dfcdfa4624c8fa
* | | Merge "improve pinch to zoom behavior" into gb-ub-photos-bryceJohn Hoford2013-04-181-8/+48
|\ \ \
| * | | improve pinch to zoom behaviorJohn Hoford2013-04-171-8/+48
| |/ / | | | | | | | | | | | | bug:8630925 Change-Id: Ica4c4ab83e726901a8e729056529aa8379cb52ae
* / / First part of asset dropMichael Kolb2013-04-172-9/+22
|/ / | | | | | | | | | | | | | | Bug: 8640131 Added new assets, updated front/back menu entry. Change-Id: I9b007cde14eeb9f44706d99ea485e03ce1de9d53
* / Add accessibility to video player controller.ztenghui2013-04-171-5/+18
|/ | | | | | | | | bug:5714277 cherry pick the Carlsbad CL: https://googleplex-android-review.git.corp.google.com/#/c/297944/ Change-Id: If0de1ec250a211890e1914d89e8b61780542a675
* Remove History panelnicolasroard2013-04-163-111/+3
| | | | | | | | | | | | Now that we have the state, history is not that useful. For clarity's sake we are removing it. bug:8620913 bug:8503386 bug:8324322 bug:8324023 Change-Id: Ife86f3ab67c05d5781234496c7518866b506631b
* 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
* | 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 "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
* | | | Don't wait for Mosaic Renderer ready in UI thread.Angus Kong2013-04-161-12/+3
|/ / / | | | | | | | | | | | | bug:8292711 Change-Id: Ic318c353fc420c0f7e573c74814757b79c798c5d
* | | New state panelnicolasroard2013-04-1511-42/+946
| | | | | | | | | | | | | | | | | | | | | bug:8620913 bug:8503386 Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
* | | 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
* | | Use extra copy of parameters for concurrent accessAngus Kong2013-04-155-25/+19
| | | | | | | | | | | | | | | bug:8585306 Change-Id: I21b8915c53508e4820e46b49171149189cb6012e
* | | Also, add labels to video menuMichael Kolb2013-04-151-0/+5
|/ / | | | | | | | | | | Bug: 8618169 Change-Id: Ia933db79eccf2564c785a12c8c6551fa8eb1007c
* | 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
* | | 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
* | | | support for simplified parameters in filterJohn Hoford2013-04-157-0/+296
| |/ / |/| | | | | | | | Change-Id: I623e6fb90e8175c7e5e2dfc146f927eecba29817
* | | Add direct rendering for bordernicolasroard2013-04-122-0/+17
|/ / | | | | | | | | | | bug:8603245 Change-Id: Ibc1bde9adb19f930b474e4076a0c2720fbe0bc8d
* | 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
* | | | Merge "Add _COUNT support for PhotoProvider to help performance of All ↵George Mount2013-04-111-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | Photos." into gb-ub-photos-bryce
| * | | | Add _COUNT support for PhotoProvider to help performance of All Photos.George Mount2013-04-111-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 8594818 Change-Id: Iab14a945e33ffcbf539b1d7acc704538e4bf48b6
* | | | | Setup geometry xforms and propogation chain.Ruben Brunk2013-04-112-2/+16
| |_|/ / |/| | | | | | | | | | | | | | | | | | | Bug: 8597538 Change-Id: I4a6b8ebcfadfd30850a73217742c740835761388
* | | | Merge "Fix camera preview being squished" into gb-ub-photos-bryceDoris Liu2013-04-112-1/+3
|\ \ \ \
| * | | | Fix camera preview being squishedDoris Liu2013-04-102-1/+3
| | |/ / | |/| | | | | | | | | | | | | | Bug: 8585407 Change-Id: Ie9a3a44c58599f4cccfa0017d48749e9883af6cd
* | | | Fix downsampling check in crop.Ruben Brunk2013-04-101-2/+4
| | | | | | | | | | | | | | | | | | | | Bug: 8586301 Change-Id: I4c5441f779122adb984368609cfea39a60190848