summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix layout issue on rotationnicolasroard2013-03-141-0/+2
| | | | Change-Id: I93956687c5c4332c3ceae6f1e3c7041fb322b041
* Merge "Fixed more threading bugs in the ImageFilterRS and the ↵Ruben Brunk2013-03-153-10/+16
|\ | | | | | | FiltersManager." into gb-ub-photos-bryce
| * Fixed more threading bugs in the ImageFilterRS and the FiltersManager.Ruben Brunk2013-03-143-10/+16
| | | | | | | | | | | | Bug: 8392832 Change-Id: I87b3af9ddb62524f02858a82eac2cc3bd2209418
* | Enable touch panning by defaultnicolasroard2013-03-141-2/+4
|/ | | | Change-Id: I7d0ced296fe84c2cfff820fbcb99f5731f9ade44
* Merge "Add many contextual actions to new gallery" into gb-ub-photos-bryceBobby Georgescu2013-03-146-23/+167
|\
| * Add many contextual actions to new galleryBobby Georgescu2013-03-146-23/+167
| | | | | | | | Change-Id: Ied57636c7bf0804ad015ddc664e177633c549e08
* | Merge "Requested RS method rename." into gb-ub-photos-bryceRuben Brunk2013-03-142-2/+2
|\ \
| * | Requested RS method rename.Ruben Brunk2013-03-142-2/+2
| | | | | | | | | | | | Change-Id: I2f158cb6cfb6ab23907e49c89f93681692e56dfb
* | | Merge "Fix exposure compensation" into gb-ub-photos-bryceMichael Kolb2013-03-141-4/+4
|\ \ \ | |/ / |/| |
| * | Fix exposure compensationMichael Kolb2013-03-141-4/+4
| | | | | | | | | | | | | | | | | | Bug: 8391082 Change-Id: I346b57dd0c1ed240ab4daa61147c2dd8f8892b44
* | | Merge "Update Gallery Pano Provider." into gb-ub-photos-bryceJustin Koh2013-03-141-2/+2
|\ \ \
| * | | Update Gallery Pano Provider.Justin Koh2013-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Update Gallery Pano Provider. Use DIP instead of PX. Change-Id: I8871502aa215012a8647401f7ee1e7906e110fe4
* | | | Merge "Change element type to A_8 to support sampling." into gb-ub-photos-bryceTim Murray2013-03-141-2/+2
|\ \ \ \
| * | | | Change element type to A_8 to support sampling.Tim Murray2013-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib91c924c9c2966bf431e24519af8ade7e360cf88
* | | | | Merge "Fix image icons on Razr M." into gb-ub-photos-bryceRuben Brunk2013-03-142-53/+65
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix image icons on Razr M.Ruben Brunk2013-03-142-53/+65
| | | | | | | | | | | | | | | | | | | | Change-Id: I9f47dd043055fb5dc25dda643a3e9c81356bd0d5
* | | | | Use plurals for table names for consistency.Mangesh Ghiware2013-03-141-2/+2
|/ / / / | | | | | | | | | | | | Change-Id: I663c0085ed467f3f61f6060147374d9128967e2d
* | / / Fix for crash upon saving imagenicolasroard2013-03-142-2/+4
| |/ / |/| | | | | | | | Change-Id: I305626a61a07d2290e7d5600da4c26f2a82ab1c9
* | | Merge "Fix photo editor RS allocation on orientation change." into ↵Nicolas Roard2013-03-141-1/+1
|\ \ \ | | | | | | | | | | | | gb-ub-photos-bryce
| * | | Fix photo editor RS allocation on orientation change.Ruben Brunk2013-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 8383050 Change-Id: Ic549d1f3fae22238dda08260cd7410c6054ce7b1
* | | | Merge "Use Model-View-Controller pattern on video module" into ↵Doris Liu2013-03-144-587/+690
|\ \ \ \ | |/ / / |/| | | | | | | gb-ub-photos-bryce
| * | | Use Model-View-Controller pattern on video moduleDoris Liu2013-03-134-587/+690
| | | | | | | | | | | | | | | | Change-Id: Id673efd1da9f53d4f74aab880504850152d1edfa
* | | | Exif parser modifications.Ruben Brunk2013-03-1330-2287/+5073
| |_|/ |/| | | | | | | | | | | Bug: 8018327 Change-Id: I66a2ec309f9807ac255bbf29d8f5f26de60e89b8
* | | Merge "Horizontal scrollable filmstrip view." into gb-ub-photos-bryceAngus Kong2013-03-132-0/+751
|\ \ \
| * | | Horizontal scrollable filmstrip view.Angus Kong2013-03-132-0/+751
| | | | | | | | | | | | | | | | Change-Id: I076a07cd9a949ecdc8e4499b171b64e7becdbef2
* | | | Merge "Sharing support for albums, bulk operations infrastructure" into ↵Bobby Georgescu2013-03-1311-198/+534
|\ \ \ \ | | | | | | | | | | | | | | | gb-ub-photos-bryce
| * | | | Sharing support for albums, bulk operations infrastructureBobby Georgescu2013-03-1311-198/+534
| | | | | | | | | | | | | | | | | | | | Change-Id: I590f60ab85ffbd9cf9d7cd9982627604fa1b427f
* | | | | Merge "Add coarse grained events for camera mode, filmstrip stats" into ↵Bobby Georgescu2013-03-132-0/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | gb-ub-photos-bryce
| * | | | Add coarse grained events for camera mode, filmstrip statsBobby Georgescu2013-03-132-0/+5
| | |/ / | |/| | | | | | | | | | Change-Id: I9c48f1646e9dff44efd27180065a6435110c5d16
* | | | Merge "Fix bug in exposure setting" into gb-ub-photos-bryceMichael Kolb2013-03-131-2/+2
|\ \ \ \
| * | | | Fix bug in exposure settingMichael Kolb2013-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8314498 Limit exposure compensation to -3 to 3; some devices offer -4 to 4, and we don't have icons covering that range Change-Id: I2b334733c7630d57682b905d41dfe2ceb5641133
* | | | | Merge "Added locking for FilteringPipeline and ImageFilterRS. Gets rid of ↵Ruben Brunk2013-03-134-74/+90
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | leaked threads." into gb-ub-photos-bryce
| * | | | Added locking for FilteringPipeline and ImageFilterRS. Gets rid of leaked ↵Ruben Brunk2013-03-134-74/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | threads. Bug: 8373600 Bug: 8363001 Bug: 8344345 Bug: 8264659 This CL fixes several things: - FilteringPipeline no longer leaks a handler thread every time photoeditor is reopened. - ImageFilterRS no longer leaks an RS context and thread every time photoeditor is reopened. - ImageFilterRS now uses locking. - ImageFilterRS no longer leaks Bitmap references or static renderscript allocations. Change-Id: I79ebde1a8ba8ad689791c2af8db0c3c907e06399
* | | | | Merge "Fix Monkey NPE" into gb-ub-photos-bryceMichael Kolb2013-03-131-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix Monkey NPEMichael Kolb2013-03-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8377895 Change-Id: Iaa89330e8c69961d700e0aab91d7855d579874f0
* | | | | Usage statistics collection for camera module, filmstripBobby Georgescu2013-03-127-3/+40
| |/ / / |/| | | | | | | | | | | Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d
* | | | Merge "Fix preview synchronization" into gb-ub-photos-brycenicolasroard2013-03-134-3/+9
|\ \ \ \
| * | | | Fix preview synchronizationnicolasroard2013-03-124-3/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Id6b5e5a140a3c366f2f5d4c29809e83ac1530d04
* | | | | fix buildJohn Reck2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I41898041ad2e6d59973af30680288c436f3c6357
* | | | | basic activated supportJohn Reck2013-03-121-3/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If1c1faf42311ddbc76b617bff5f3c6bdafdef5d1
* | | | | Use viewpagerJohn Reck2013-03-121-49/+96
|/ / / / | | | | | | | | | | | | Change-Id: Icd320799ce1e13815e34b2a0e45a9f6a47736de3
* | | | Merge "Add loading resources helper functions to ImageFilterRS" into ↵nicolasroard2013-03-121-3/+30
|\ \ \ \ | |_|/ / |/| | | | | | | gb-ub-photos-bryce
| * | | Add loading resources helper functions to ImageFilterRSnicolasroard2013-03-121-3/+30
| | | | | | | | | | | | | | | | Change-Id: I79b4996b5da0fa05536f2f53f770d01e9735b96c
* | | | Merge "Add delete cascade for Accounts." into gb-ub-photos-bryceGeorge Mount2013-03-123-6/+56
|\ \ \ \ | |_|/ / |/| | |
| * | | Add delete cascade for Accounts.George Mount2013-03-123-6/+56
| | | | | | | | | | | | | | | | Change-Id: I962c7cb657643c3eddbbeb6a691b26de5553d4df
* | | | Fix ICS compatibility issuesJohn Reck2013-03-123-15/+64
|/ / / | | | | | | | | | Change-Id: I43f3236b9da0424fde66d3ad4d46403223fde8bf
* | | Merge "Add support for local storage of uploaded pictures." into ↵George Mount2013-03-121-1/+1
|\ \ \ | |_|/ |/| | | | | gb-ub-photos-bryce
| * | Add support for local storage of uploaded pictures.George Mount2013-03-121-1/+1
| | | | | | | | | | | | Change-Id: I23c86e6a95871effcb76a54b16b9ab7720a63383
* | | Merge "Open camera only once in Video module" into gb-ub-photos-bryceMichael Kolb2013-03-121-2/+14
|\ \ \ | |_|/ |/| |
| * | Open camera only once in Video moduleMichael Kolb2013-03-121-2/+14
| | | | | | | | | | | | | | | | | | Bug: 8272736 Change-Id: Id28fde5da62083651627dc8c734e818afe22a6e0