summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix NPE due to progress bar not existing." into gb-ub-photos-archesGeorge Mount2012-10-101-6/+8
|\
| * Fix NPE due to progress bar not existing.George Mount2012-10-101-6/+8
| | | | | | | | | | | | Bug 7325685 Change-Id: I5e24b4f8a0ee4016c122e14702e3ae575f5bb56f
* | Merge "Change FilterShow theme and extra remove gray line" into ↵Bobby Georgescu2012-10-101-3/+0
|\ \ | |/ |/| | | gb-ub-photos-arches
| * Change FilterShow theme and extra remove gray lineBobby Georgescu2012-10-101-3/+0
| | | | | | | | | | Bug: 7326326 Change-Id: Ie2286e36da77fb22907f21d084177268f919d10e
* | forced fx bitmaps to load unscaledJohn Hoford2012-10-101-1/+3
| | | | | | | | | | bug:7327105 Change-Id: I780638f6919e89ae957993732fdbe123e8d8e866
* | Merge "add White balance & disable UI elements" into gb-ub-photos-archesJohn Hoford2012-10-103-11/+38
|\ \ | |/ |/|
| * add White balance & disable UI elementsJohn Hoford2012-10-103-11/+38
| | | | | | | | | | bug:7234321 Change-Id: Ic44bfe30b5d25e7d4442c4e6d4fd9e0e8410c7af
* | Merge "Disable in-place crop for 360 panorama" into gb-ub-photos-archesMangesh Ghiware2012-10-102-2/+4
|\ \ | |/ |/|
| * Disable in-place crop for 360 panoramaMangesh Ghiware2012-10-102-2/+4
| | | | | | | | | | Bug: 7281479 Change-Id: Id89e25a883a5eab8a91604ebfeab4f178ba1066f
* | Fix missing camera thumbnail in filmstripBobby Georgescu2012-10-101-0/+1
|/ | | | | Bug: 7319894 Change-Id: Id1cf4f4bf718853aec73c0765732ac59e448c5d6
* Merge changes Ic62822a4,Ie6505c8e into gb-ub-photos-archesGeorge Mount2012-10-107-72/+120
|\ | | | | | | | | | | * changes: Change how stitched images are inserted into Gallery. Move panorama stitch progress outside the image.
| * Change how stitched images are inserted into Gallery.George Mount2012-10-106-87/+30
| | | | | | | | | | | | | | | | | | Bug 7299396 Stitching images now use normal LocalImages for their MediaItem instead of LightCycleItems. They are no longer part of a special album. Change-Id: Ic62822a44b9743829dee50bcfa6f455cd538afa7
| * Move panorama stitch progress outside the image.George Mount2012-10-102-4/+109
| | | | | | | | | | | | Bug 7302513 Change-Id: Ie6505c8ed2125b878e54a93c4b8c0f51d80a1385
* | Support REVERSE in lockOrientationJohn Reck2012-10-101-2/+8
| | | | | | | | | | | | Bug: 7314703 Change-Id: Id459e49496f562e75c1485d9d717daa28020a587
* | Fix inverted panorama previewJohn Reck2012-10-091-0/+4
| | | | | | | | | | | | | | | | Bug: 7314703 Panorama only support rotations of 0 and 90, so if it is greater than that flip the output surface texture Change-Id: I9885feb88d2d1c3e0dabaa7ecd8db66c2ddfb93b
* | small fix to red eye codeJohn Hoford2012-10-091-1/+2
|/ | | | | bug:7234321 Change-Id: I796b11fd3050bf3582749e02f7d8173bc78ea292
* Latest UInicolasroard2012-10-0914-35/+221
| | | | | | | | | bug:7233983 bug:7233980 Also fixes border scaling issues. Change-Id: Ia9365800e057f481936ffdd13a5d8c5a9dab14b5
* add filtersJohn Hoford2012-10-093-1/+107
| | | | | bug:7234321 Change-Id: I4c9695c3ad90fcb7f4d67d40faa0a7da85f99030
* Merge "Correct stale background on completely empty gallery" into ↵Bobby Georgescu2012-10-091-0/+1
|\ | | | | | | gb-ub-photos-arches
| * Correct stale background on completely empty galleryBobby Georgescu2012-10-091-0/+1
| | | | | | | | | | | | | | | | | | Bug: 7314560 When the last album is delete by long pressing and pressing the delete icon, and the gallery is left completely empty, the slotview was not being correctly invalidated. Change-Id: I2d5ec7ac7fb9604fd74ca8fa4fa6df09d6dec49d
* | Merge "Update design for grid/filmstrip switcher" into gb-ub-photos-archesBobby Georgescu2012-10-091-13/+14
|\ \
| * | Update design for grid/filmstrip switcherBobby Georgescu2012-10-091-13/+14
| |/ | | | | | | | | Bug: 7317501 Change-Id: I8975071b2a6d8b9f03c54c4bd3a6aa157fc6dc2e
* | Merge "Fix lack of snapback on very short scroll" into gb-ub-photos-archesBobby Georgescu2012-10-091-3/+2
|\ \
| * | Fix lack of snapback on very short scrollBobby Georgescu2012-10-091-3/+2
| |/ | | | | | | | | | | | | | | | | | | | | Bug: 7318609 snapToNeighborImage returns false if it didn't actually need to move to a neighboring image, so use this information to correctly snapback if needed. Change-Id: I28bbcb5ea224957fefa3838891c4343a1d9b8aff
* | Merge "Implementing Geometry save operations." into gb-ub-photos-archesRuben Brunk2012-10-091-5/+14
|\ \
| * | Implementing Geometry save operations.Ruben Brunk2012-10-091-5/+14
| | | | | | | | | | | | | | | | | | Bug: 7224232 Bug: 7218935 Change-Id: I83e5f8a5dc29c5b6be0bb69f10eadf823122bb97
* | | Merge "Dejank camera roll scrolling in grid view." into gb-ub-photos-archesBobby Georgescu2012-10-092-5/+3
|\ \ \
| * | | Dejank camera roll scrolling in grid view.Pin Ting2012-10-092-5/+3
| |/ / | | | | | | | | | | | | Bug:7302644 Change-Id: I280be430101f57dde5a5a6f427cf48e725e39b45
* | / Fix share crash after closing photo editorBobby Georgescu2012-10-091-0/+16
| |/ |/| | | | | | | Bug: 7306707 Change-Id: If589e1d84bc05c4d68a02feed7aaed05a568359d
* | Merge "Add procedural borders" into gb-ub-photos-archesnicolasroard2012-10-094-48/+142
|\ \
| * | Add procedural bordersnicolasroard2012-10-084-48/+142
| |/ | | | | | | | | bug:7233980 Change-Id: I81008efa3d256061ec27d1ca2333debfb0ab6dd5
* | Handle stitching progress in secure album.Wu-cheng Li2012-10-093-28/+58
| | | | | | | | | | | | | | | | | | | | | | - In secure album, show stitching progress only if it is captured after the device is locked. - Make sure image capture intent does not show stitching progress. bug:7285105 Change-Id: I0b3ba60fe3c03f488bea25e2f09843dd84ab6dfb
* | Fix sharing as photo option for 360 degree panoramaMangesh Ghiware2012-10-092-25/+28
|/ | | | | | | | | Bug: 7310190 Bug: 7302023 Also, fix disappearing sharing menu item in action bar. Change-Id: Id555426cce5f25d21405c885b6f7331d238cdd07
* Merge "Start Camera album in grid mode" into gb-ub-photos-archesBobby Georgescu2012-10-081-3/+2
|\
| * Start Camera album in grid modeBobby Georgescu2012-10-081-3/+2
| | | | | | | | | | Bug: 7304603 Change-Id: I537f74cd0d34b4b095c031572f8d817dd49b6388
* | Fix crash when starting the editornicolasroard2012-10-081-2/+2
| | | | | | | | | | | | | | | | Bug: 7224232 CL 236429 readded offending lines after the merge... Change-Id: I670c60ba366d2c8ec343b26c65580e8900c67819
* | Added the rest of the Geometryfilter stubs.Ruben Brunk2012-10-084-19/+140
| | | | | | | | | | | | Bug: 7224232 Bug: 7218935 Change-Id: I9ebbc4a98b5696e1514995e465aa4e145fdfa4f8
* | Merge "Fix crash introduced with the GeometryMetadata" into gb-ub-photos-archesnicolasroard2012-10-086-43/+67
|\ \
| * | Fix crash introduced with the GeometryMetadatanicolasroard2012-10-086-43/+67
| |/ | | | | | | | | | | | | | | | | | | | | bug:7224232 bug:7279964 bug:7298708 - Also remove the slide gesture (only use the slider widget) - use scaleFactor to apply sharpen proportionally Change-Id: Icce786cb53f2d3d6feada76c63108a563aaab7a3
* / Fix details dialog not being dismissedDoris Liu2012-10-081-0/+2
|/ | | | | Bug: 7300997 Change-Id: I0d0dad50a9777f8ea49889a4517b8704a03021c5
* Use framework orientationJohn Reck2012-10-082-25/+0
| | | | | | Bug: 7292373 Change-Id: I66e0c3a3b43a5d544ecc3fc9a4a04fa5521d36b2
* Merge "add redeye and improve shadow removal" into gb-ub-photos-archesJohn Hoford2012-10-084-36/+57
|\
| * add redeye and improve shadow removalJohn Hoford2012-10-084-36/+57
| | | | | | | | | | bug:7234321 Change-Id: I12c2eb28555d7594fddf86dfa224219b70137681
* | Correct undo behaviorBobby Georgescu2012-10-082-9/+4
|/ | | | | Bug: 7307293 Change-Id: I72f814acd3625024f1e2aeccec4abfd28ad3319b
* Added stub for applying geometry flip.Ruben Brunk2012-10-083-8/+54
| | | | | | Bug: 7224232 Bug: 7218935 Change-Id: Iaeea6a94f4fea44a8046f09a0fce72fe32ed7cc0
* Adding Crop, Rotate, Flip.Ruben Brunk2012-10-0811-217/+1686
| | | | | | | | | Bug: 7224232 Bug: 7218935 Adding geometry manipulation UI features. Change-Id: If924313c18121e6d192a1934e76691bd578d8eb0
* Share only 360-degree panoramas with new MIME typeMangesh Ghiware2012-10-088-14/+52
| | | | | | | | | | Bug: 7302972 Instead of using the UsePanoramaViewer attribute in XMP metadata, ensure that the panorama is full 360 degree by checking if the cropped width is same as the full panorama width. Change-Id: I66d864df96052f96db5fa19fb02b3abe214b4dec
* Launch correct photo when tapping grid item in Camera rollBobby Georgescu2012-10-071-2/+2
| | | | | Bug: 7303049 Change-Id: Ie3dd2b010d60669cd000a2ed9b52e0611b0977bd
* Merge "Fix ANR in creating the fallback animation." into gb-ub-photos-archesOwen Lin2012-10-071-3/+4
|\
| * Fix ANR in creating the fallback animation.Owen Lin2012-10-051-3/+4
| | | | | | | | | | bug: 6620501 Change-Id: Ibb798cce5dd49bb5083de6f29225bae512d589f8