summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Remove dead codeBobby Georgescu2013-04-201-3/+1
| | | | | Bug: 8672542 Change-Id: Ia6046b17f8ae77ffe6b8090b5fbd1dda2bc0327e
* Merge "Ensure consistent image thumbnail handling." into gb-ub-photos-bryceRuben Brunk2013-04-191-0/+3
|\
| * Ensure consistent image thumbnail handling.Ruben Brunk2013-04-191-0/+3
| | | | | | | | | | | | Bug: 7192433 Change-Id: Ie86ade06b7234681a0d955a87cacfb337bc39145
* | Merge "Fix saved video timestamps." into gb-ub-photos-bryceRuben Brunk2013-04-191-1/+3
|\ \ | |/ |/|
| * Fix saved video timestamps.Ruben Brunk2013-04-191-1/+3
| | | | | | | | | | Bug: 8002939 Change-Id: I771b2b4082acd19bbf9b52c65f51da9489827c18
* | tiny planet fixJohn Hoford2013-04-1911-45/+168
|/ | | | | bug:8323524 Change-Id: I39283face7079574dbe25e797323a84141930f9a
* Merge "Make MediaSaveService destroyed after unbound." into gb-ub-photos-bryceAngus Kong2013-04-191-2/+0
|\
| * Make MediaSaveService destroyed after unbound.Angus Kong2013-04-191-2/+0
| | | | | | | | | | bug:8528779 Change-Id: I1e6b78d5603b10cde3399969cd7a8cc19655051b
* | Merge "Save video using MediaSaveService." into gb-ub-photos-bryceAngus Kong2013-04-192-148/+98
|\ \ | |/ |/|
| * Save video using MediaSaveService.Angus Kong2013-04-192-148/+98
| | | | | | | | | | bug:8511719 Change-Id: I3fc5054bf7661953181b27e66cc70ba95082d36c
* | 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 "Pass the camera to recorders after all is set." into gb-ub-photos-bryceAngus Kong2013-04-191-0/+1
|\ \ \
| * | | Pass the camera to recorders after all is set.Angus Kong2013-04-181-0/+1
| | | | | | | | | | | | | | | | | | | | bug:8049369 Change-Id: I5cd658e78905a7b41f97ee0cce820f0c8bc99dd5
* | | | Merge "Fix memory leak in pie controller" into gb-ub-photos-bryceDoris Liu2013-04-191-0/+1
|\ \ \ \
| * | | | Fix memory leak in pie controllerDoris Liu2013-04-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7622218 Change-Id: Iaab96008a4f4b506bb0be98f489af9120d607251
* | | | | Merge "Allow swiping to filmstrip from blocker bar" into gb-ub-photos-bryceDoris Liu2013-04-195-12/+44
|\ \ \ \ \
| * | | | | Allow swiping to filmstrip from blocker barDoris Liu2013-04-185-12/+44
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 8607910 Change-Id: I69bfcf8d95d6071be7d65fbf433916740cbb655c
* | | | | 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
* | | | Merge "Remove unused imports." into gb-ub-photos-bryceFlavio Lerda2013-04-181-4/+0
|\ \ \ \
| * | | | 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
* | | | | Add more menu options/iconsMichael Kolb2013-04-182-42/+80
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8640131 Added location and scene mode to secondary menu Updated HDR icons Change-Id: I5bed39a2ec037aecf67702d88f738befe61846d4
* | | | Merge "Change labels so that it doesn't clash with PanoUiLib." into ↵George Mount2013-04-181-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | gb-ub-photos-bryce
| * | | Change labels so that it doesn't clash with PanoUiLib.George Mount2013-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 8401273 PanoUiLib is required for all Gallery Wolfie UI. Change-Id: Icd58c5f4c03945c29f6bf3be286d2321abf2f63a
* | | | 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
* | | | | 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