summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "New capture animation" into gb-ub-photos-bryceMichael Kolb2013-02-151-25/+79
|\
| * New capture animationMichael Kolb2013-02-141-25/+79
| | | | | | | | Change-Id: I45dd4989fcebd5fc69cfff55d69827574a438ec4
* | Merge "Merging camera test with gallery test." into gb-ub-photos-bryceJason Noguchi2013-02-1515-0/+1723
|\ \
| * | Merging camera test with gallery test.Jason Noguchi2013-02-1415-0/+1723
| | | | | | | | | | | | Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841
* | | Merge "Fixed crop display for setting contacts/wallpapers." into ↵Ruben Brunk2013-02-152-12/+20
|\ \ \ | | | | | | | | | | | | gb-ub-photos-bryce
| * | | Fixed crop display for setting contacts/wallpapers.Ruben Brunk2013-02-142-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8187056 Bug: 8196779 Bug: 8140241 Change-Id: Iaf3d113d9e53d365b73985fdc3350b627f8bda4c
* | | | Merge "refactor to support many filter based on RedEye" into gb-ub-photos-bryceJohn Hoford2013-02-149-196/+287
|\ \ \ \ | |_|_|/ |/| | |
| * | | refactor to support many filter based on RedEyeJohn Hoford2013-02-149-196/+287
| |/ / | | | | | | | | | Change-Id: I92ff19d8f750f5bf4c188129580e22990874501e
* | | Merge "Fix inexplicable monkey NPE" into gb-ub-photos-bryceMichael Kolb2013-02-141-0/+1
|\ \ \ | |/ / |/| |
| * | Fix inexplicable monkey NPEMichael Kolb2013-02-141-0/+1
| | | | | | | | | | | | | | | | | | Bug: 8049510 Change-Id: Idbd624a309bc026a1805030982cb0cb7ace698ee
* | | Fix video disappearing when rotatedDoris Liu2013-02-131-6/+8
| | | | | | | | | | | | | | | Bug: 7459723 Change-Id: I0f42e476cfda6c0c757ca1fda3dd8072bec25a37
* | | Make ShutterButton visible after initialization.Angus Kong2013-02-131-0/+1
| | | | | | | | | | | | | | | bug:8186870 Change-Id: I45e33532e82cc128c25e61e3bf57843aef24edc2
* | | get redeye working againJohn Hoford2013-02-1310-9/+48
| | |
* | | Fix sync representationsnicolasroard2013-02-133-2/+25
| |/ |/| | | | | Change-Id: I8b1b159a2350f7ee8bcdc7e71faf82ab5df2755b
* | fix draw to support rotation/cropJohn Hoford2013-02-133-7/+11
| | | | | | | | Change-Id: Iea1db9e42f1fa2b86a452bf1d40b1663b69d03e2
* | Merge "Importer: Full-screen viewing, UI refinement, refactoring" into ↵Bobby Georgescu2013-02-1313-218/+907
|\ \ | | | | | | | | | gb-ub-photos-bryce
| * | Importer: Full-screen viewing, UI refinement, refactoringBobby Georgescu2013-02-1213-218/+907
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7990333 Bug: 8151814 Bug: 8037411 This CL adds or changes the following things: - Full-screen image viewing and UI for switching modes - Moved general functionality from MtpThumbnailTileView to MtpImageView to allow for reuse in full-screen image use-case - MtpBitmapCache moved from ui to data package - Orientation now respected when set in image metadata - Miscellaneous UI consistency issues fixed - Miscellaneous instability issues fixed Change-Id: I5f188b763617b693e32fedc03273d711d604922a
* | | Pass the ImagePreset to ImageFilternicolasroard2013-02-133-7/+5
| | | | | | | | | | | | Change-Id: I4c195a5eb6055c3bb43fed60e76751ed133ab725
* | | Fix curves slownessnicolasroard2013-02-121-0/+2
| | | | | | | | | | | | Change-Id: If25f3ce1c3da02daa90405987075b87ce676c84e
* | | Clean up red eye correctionnicolasroard2013-02-124-62/+2
| | | | | | | | | | | | Change-Id: I19a8006ed31767ae8e33388cc5b11b5c68d5ae2d
* | | fix ranges for various filtersJohn Hoford2013-02-1211-8/+44
| | | | | | | | | | | | Change-Id: I6790b06c5c4094c442ce19cb2ed7ddb6a4152f3a
* | | Merge "Wait for the previous MosaicPreviewRenderer to end" into ↵Angus Kong2013-02-132-2/+4
|\ \ \ | | | | | | | | | | | | gb-ub-photos-bryce
| * | | Wait for the previous MosaicPreviewRenderer to endAngus Kong2013-02-122-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When changing orientations very fast, there might be 2 MosaicPreviewRenderer instances accessing the SRI native library at the same time. The library is not designed so. bug:8151753 Change-Id: Ie7a381349feeb95b40bae3c093cfcb66acba9069
* | | | Merge "Turn back on the state panel" into gb-ub-photos-brycenicolasroard2013-02-134-5/+13
|\ \ \ \
| * | | | Turn back on the state panelnicolasroard2013-02-124-5/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: I22706078d4026ce4e24917c484a30a56de431983
* | | | | Merge "fix the draw clear bug" into gb-ub-photos-bryceJohn Hoford2013-02-133-3/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix the draw clear bugJohn Hoford2013-02-123-3/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I1050c3e1ad1280480f35a03c9d29dc1cd44b515f
* | | | | Merge "DO NOT MERGE: Don't call requestLayout from onLayout" into ↵Tenghui Zhu2013-02-121-4/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | gb-ub-photos-bryce
| * | | | | DO NOT MERGE: Don't call requestLayout from onLayoutMarco Nelissen2013-02-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing a layout within a layout can lead to various problems, so it should be avoided. There's some logging that warns of this, which got triggered by CommonControllerOverlay. I don't know what problem this code was originally trying to solve, but it doesn't seem to be necessary anymore. The line in question was originally introduced in change 209a9163d4e8cee0bfe162ae598ef40e6051479c, in Oct 2011. Note: This has been checked into master, this is just cherry picking into Bryce branch. Change-Id: I7651304491a90e8d130f4a0a3b3de8e29c4d0116
* | | | | | Add null check on the source URInicolasroard2013-02-122-2/+2
| |/ / / / |/| | | | | | | | | | | | | | | | | | | bug:8181133 Change-Id: I1a7226db3ceb42a759f24c9b70f140a63a4294f0
* | | | | Limit preview sizenicolasroard2013-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4b9b43abcb509407f9244a776d31cc96876a26cd
* | | | | Refactor FiltersManagernicolasroard2013-02-1213-123/+133
| | | | | | | | | | | | | | | | | | | | Change-Id: I4c42ddb90e65e90af873eb8dbe065f4fa3de69ef
* | | | | refactor quality to be intJohn Hoford2013-02-1233-73/+95
|/ / / / | | | | | | | | | | | | Change-Id: I0470abdbe75cf48c5228e80b9dc060ae6f3d8bbd
* | | | Add reset bitmap for RS filtersnicolasroard2013-02-123-0/+46
| | | | | | | | | | | | | | | | Change-Id: I34e28ca72d13f9b5f8054d8a2c07cfffca4e85c6
* | | | Update thumbnails when the geometry changesnicolasroard2013-02-123-2/+54
| |_|/ |/| | | | | | | | Change-Id: I44d70839efb7e00edfb1e6c1f73296beab09783c
* | | Merge "Generate thumbnails asynchronously" into gb-ub-photos-brycenicolasroard2013-02-126-22/+67
|\ \ \
| * | | Generate thumbnails asynchronouslynicolasroard2013-02-126-22/+67
| | | | | | | | | | | | | | | | Change-Id: I6a2520fc869280a2a7be9c9b5673e17038964a02
* | | | remove animations if before Jelly BeanJohn Hoford2013-02-122-9/+28
| | | | | | | | | | | | | | | | Change-Id: Ifb60390f513f60af2875cbc2218fdc185752e9b2
* | | | fixes the draw and clean up the UIJohn Hoford2013-02-113-22/+41
|/ / / | | | | | | | | | Change-Id: Ia52dfc3ec407c307612dcfc91fb61a1fb89e32ec
* | | Merge "Adding support for ICS" into gb-ub-photos-brycenicolasroard2013-02-123-35/+86
|\ \ \
| * | | Adding support for ICSnicolasroard2013-02-113-35/+86
| |/ / | | | | | | | | | Change-Id: I550d461b08a4cc5ceb3cdefd82301d5986325184
* / / fix red eye to use the new systemJohn Hoford2013-02-117-130/+268
|/ / | | | | | | Change-Id: If79106dc3144cce374afd410f5f859692e564b83
* | Merge "Only create one RS context." into gb-ub-photos-bryceTim Murray2013-02-111-1/+3
|\ \
| * | Only create one RS context.Tim Murray2013-02-111-1/+3
| | | | | | | | | | | | Change-Id: I527da839142cd2e48fb81e8cb02b43f6f87147d6
* | | Move useFilterRepresentation to PanelControllernicolasroard2013-02-113-39/+28
| | | | | | | | | | | | Change-Id: I8abd9b2bd1b808df6a84e334b6eaa36b1c16750d
* | | Merge "Cleaning filters" into gb-ub-photos-brycenicolasroard2013-02-1135-570/+245
|\ \ \ | |/ / |/| |
| * | Cleaning filtersnicolasroard2013-02-1135-570/+245
| | | | | | | | | | | | Change-Id: I413b935f90cebdab37d3db73d7fcb0fe77a64579
* | | Merge "Lock focus during countdown" into gb-ub-photos-bryceDoris Liu2013-02-111-1/+6
|\ \ \
| * | | Lock focus during countdownDoris Liu2013-02-071-1/+6
| | | | | | | | | | | | | | | | Change-Id: Ia8d4250daa488c35e276218e9fdb8efdf00836c2
* | | | Merge "Fix camera setting icons appearing in wrong place" into ↵Doris Liu2013-02-111-0/+61
|\ \ \ \ | |_|/ / |/| | | | | | | gb-ub-photos-bryce