summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
Commit message (Collapse)AuthorAgeFilesLines
* Fix multi selection issueBobby Georgescu2013-04-191-5/+9
| | | | | Bug: 8663155 Change-Id: Ic6aa98c04b5134df9deb1b14736e614bf1618f03
* Merge "Lock camera orientation using FW API" into gb-ub-photos-bryceMichael Kolb2013-04-191-1/+6
|\
| * Lock camera orientation using FW APIMichael Kolb2013-04-151-1/+6
| | | | | | | | | | | | Bug: 8617536 Change-Id: Id3a5ae777f6f87d24984cbca48202470651cd71c
* | Merge "Fix crop activity aspect ratio and orientation handling." into ↵Ruben Brunk2013-04-194-44/+88
|\ \ | | | | | | | | | gb-ub-photos-bryce
| * | Fix crop activity aspect ratio and orientation handling.Ruben Brunk2013-04-184-44/+88
| | | | | | | | | | | | | | | | | | Bug: 8659064 Bug: 8647628 Change-Id: I3e4293cc3bba7d55334acb396e20a23cc92f8f82
* | | Merge "fixed borders issues" into gb-ub-photos-bryceJohn Hoford2013-04-195-65/+44
|\ \ \
| * | | fixed borders issuesJohn Hoford2013-04-185-65/+44
| |/ / | | | | | | | | | | | | bug:8315216 Change-Id: I04d62984c70e7e514b8625e6a4b5ed9395137471
* / / Remove unused imports.Flavio Lerda2013-04-181-4/+0
|/ / | | | | | | | | | | | | | | This is follow-up on the previous fix for b/8433834, addressing reviewer comments. Bug: 8433834 Change-Id: I06f466704175a62d8febc5be471a2ca1f50e898d
* | 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-182-3/+35
|\ \
| * | Usage statistics for sharing.Flavio Lerda2013-04-172-3/+35
| | | | | | | | | | | | | | | Bug: 8433834 Change-Id: Iaec6150443258daa213395b6fb1e8d8d3e6123b3
* | | Remove call to superclass onTouch in curves.Ruben Brunk2013-04-171-2/+0
| | | | | | | | | | | | | | | Bug: 8523301 Change-Id: I0102a228c2d1b3199412c9897a9f1abdb4bcb41f
* | | Remove redeye filter.Ruben Brunk2013-04-171-2/+2
| | | | | | | | | | | | | | | Bug: 8609003 Change-Id: I7f10e928fa775e5186146f06877dda34b3df699a
* | | improve pinch to zoom behaviorJohn Hoford2013-04-171-8/+48
| | | | | | | | | | | | | | | bug:8630925 Change-Id: Ica4c4ab83e726901a8e729056529aa8379cb52ae
* | | 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
* | | | Remove the Simple Edit menu item in Gallerynicolasroard2013-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | bug:8609003 Change-Id: Ida6bfec65bf4b78c7c1b64f759c750ef9255bb6c
* | | | New state panelnicolasroard2013-04-1511-42/+946
| |/ / |/| | | | | | | | | | | | | | | | | bug:8620913 bug:8503386 Change-Id: I35c95103e3b5097df93fa3f48e5562a479915f06
* | | 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
* | G+ crop overlay shadows. Aspect ratios.Ruben Brunk2013-04-113-3/+13
|/ | | | | | Bug: 8597538 Change-Id: I9a7225a125bef7e11d6bf420bf1fa55e7f22c909
* Show loading indicator in full-screen importer viewBobby Georgescu2013-04-111-0/+3
| | | | | Bug: 8599282 Change-Id: I568d5077e8e5450da49cd4d75df39973b84d081f
* Setup geometry xforms and propogation chain.Ruben Brunk2013-04-112-2/+16
| | | | | | Bug: 8597538 Change-Id: I4a6b8ebcfadfd30850a73217742c740835761388
* Fix downsampling check in crop.Ruben Brunk2013-04-101-2/+4
| | | | | Bug: 8586301 Change-Id: I4c5441f779122adb984368609cfea39a60190848
* Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryceBobby Georgescu2013-04-101-2/+59
|\
| * Correctly scale images in MTP importerBobby Georgescu2013-04-101-2/+59
| | | | | | | | | | Bug: 8293048 Change-Id: Ib46a6ce13aeea6a59706790b69be29215be7ebc4
* | Merge "Adding simple crop ui. Refactoring." into gb-ub-photos-bryceRuben Brunk2013-04-103-88/+112
|\ \
| * | Adding simple crop ui. Refactoring.Ruben Brunk2013-04-103-88/+112
| | | | | | | | | | | | Change-Id: I904ce776ca31cf2f782b0aa8e6456ab54b15e540
* | | Merge "Use MediaMuxer for the video trim and mute." into gb-ub-photos-bryceztenghui2013-04-102-31/+179
|\ \ \
| * | | Use MediaMuxer for the video trim and mute.ztenghui2013-04-102-31/+179
| | | | | | | | | | | | | | | | | | | | | | | | bug:8548085 Change-Id: I55955285ee141ebab6437950a154280cc5fefcc0
* | | | Small cleanup in setting resourcesnicolasroard2013-04-103-16/+14
| | | | | | | | | | | | | | | | Change-Id: Icd275aaddcee59a578f916c57903012ce35469ad
* | | | Add a third pipeline reserved for the high res previewnicolasroard2013-04-092-2/+18
| |/ / |/| | | | | | | | Change-Id: I1f35f0a7195157e5fe742d7d7c5506b3f84ece1b
* | | Merge "support icon styles" into gb-ub-photos-bryceJohn Hoford2013-04-105-27/+27
|\ \ \
| * | | support icon stylesJohn Hoford2013-04-095-27/+27
| | | | | | | | | | | | | | | | Change-Id: I9a4af2826824fd519099363b3190fc417b67c022
* | | | Detach old editornicolasroard2013-04-092-2/+7
| | | | | | | | | | | | | | | | Change-Id: I1b0a30aa334a83011d9f03ea629e1b0f36ea21d2
* | | | Merge "Implements swipe in editor menu" into gb-ub-photos-brycenicolasroard2013-04-092-1/+131
|\ \ \ \
| * | | | Implements swipe in editor menunicolasroard2013-04-092-1/+131
| |/ / / | | | | | | | | | | | | Change-Id: I5871da89d2e911d5b6663cdee8dc660ab0777393
* | | | Merge "Moving crop to a separate activity. Refactoring." into ↵Ruben Brunk2013-04-0915-15/+1291
|\ \ \ \ | |/ / / |/| | | | | | | gb-ub-photos-bryce
| * | | Moving crop to a separate activity. Refactoring.Ruben Brunk2013-04-0915-15/+1291
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8526929 Change-Id: I8acf6d46de069dd84c31afea6b4a7ae8e1c2fcce
* | | | Merge "Hide the category panel when editing" into gb-ub-photos-brycenicolasroard2013-04-092-0/+18
|\ \ \ \
| * | | | Hide the category panel when editingnicolasroard2013-04-092-0/+18
| | |_|/ | |/| | | | | | | | | | Change-Id: I181ab1aa3ee27bf38a88999caf31eedc263cfe96
* / | | ui cleanupJohn Hoford2013-04-091-13/+11
|/ / / | | | | | | | | | Change-Id: Ifb08af6bfad2f049b66932360901b2e52ff07f01