summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* on entry check if Tiny Planet if not remove UIJohn Hoford2012-10-223-1/+58
| | | | | bug:7391885 Change-Id: Ic2bffa9f9fbaa2d437ce231a1478a1b63a0eed83
* Merge "Minor transition tweaks" into gb-ub-photos-archesBobby Georgescu2012-10-221-16/+9
|\
| * Minor transition tweaksBobby Georgescu2012-10-221-16/+9
| | | | | | | | | | Bug: 7376109 Change-Id: Id4a761c3d601e453ac1ad2edbbea986af14bb21c
* | Merge "Show panorama thumbs in Gallery grid view" into gb-ub-photos-archesDoris Liu2012-10-225-26/+26
|\ \
| * | Show panorama thumbs in Gallery grid viewDoris Liu2012-10-225-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7362229 Bug: 7378208 In addition to showing pano thumbs, this CL also removes the video play icon on the top-level album view thumbnails. Change-Id: I950bc66c38575036d5ad7464a2fd9a5dea9fae4b
* | | Merge "Move new exif lib to gallerycommon." into gb-ub-photos-archesHung-ying Tyan2012-10-2213-0/+0
|\ \ \
| * | | Move new exif lib to gallerycommon.Hung-ying Tyan2012-10-2213-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://googleplex-android-review.googlesource.com/#/c/242047 depends on this. Bug: 6667860 Change-Id: Iac937e2eea94f0f5ffde876235b1c2ee748e7570
* | | | Merge "Drive GLRootView with Choreographer" into gb-ub-photos-archesJohn Reck2012-10-222-0/+18
|\ \ \ \
| * | | | Drive GLRootView with ChoreographerJohn Reck2012-10-222-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7332724 By routing requestRender through postOnAnimation we can drive the GLRootView's rendering with the UI thread's coreographer, which ensures that touch events are processed before drawing Change-Id: Iac2b3229e9a09ee0319c64c5fc7cb906512a379c
* | | | | Merge "Scroll to placeholder in gallery filmstrip launches camera" into ↵Bobby Georgescu2012-10-221-3/+13
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | gb-ub-photos-arches
| * | | | Scroll to placeholder in gallery filmstrip launches cameraBobby Georgescu2012-10-221-3/+13
| | |_|/ | |/| | | | | | | | | | | | | | Bug: 7368079 Change-Id: I50323b6b4d64672486cdca785b9f1e1ae2f02a97
* | | | Merge "Fix geometry xforms & minor bug." into gb-ub-photos-archesRuben Brunk2012-10-222-25/+8
|\ \ \ \
| * | | | Fix geometry xforms & minor bug.Ruben Brunk2012-10-222-25/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7376048 Fixed geometry transform. Fixed minor bug where the foldername for saved edited images was incorrect. Change-Id: I901df11cf71cd987b354dd7821fef7a484b0cbd3
* | | | Merge "Add null-check for StitchingServiceProvider." into gb-ub-photos-archesGeorge Mount2012-10-221-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Add null-check for StitchingServiceProvider.George Mount2012-10-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Bug 7386827 Change-Id: Id1ec7399202c6e67bb215f1309697b2f718a3c03
* | | | Merge "Better transition between Gallery and editor" into gb-ub-photos-archesBobby Georgescu2012-10-221-0/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Better transition between Gallery and editorBobby Georgescu2012-10-221-0/+7
| |/ / | | | | | | | | | | | | Bug: 7346155 Change-Id: I5f6b0901df4aa37d1657c13917aeae7ad77ac9bf
* / / Fix to ensure visible history adapter strings are from xml.Ruben Brunk2012-10-228-13/+35
|/ / | | | | | | | | Bug: 7379327 Change-Id: I5fcb6fec1e9abe05689dd3b9f4e70e518a9e09d1
* | Merge "Fix the undo/redo/reset menu item state" into gb-ub-photos-archesnicolasroard2012-10-222-4/+59
|\ \
| * | Fix the undo/redo/reset menu item statenicolasroard2012-10-212-4/+59
| |/ | | | | | | | | | | | | | | | | bug:7357734 - enable/disable the undo/redo/reset menu item depending on the history. Change-Id: I633008bc9a99eef2e7289b290fc96120f09b3825
* | Merge "Tweak transition animations" into gb-ub-photos-archesBobby Georgescu2012-10-211-2/+2
|\ \ | |/ |/|
| * Tweak transition animationsBobby Georgescu2012-10-211-2/+2
| | | | | | | | | | Bug: 7376109 Change-Id: I28cc8413bda31ff945e8e48dd75b86b2e9d071a8
* | Prevent unveil direction to change as long as no touch upnicolasroard2012-10-211-7/+22
| | | | | | | | | | bug:7385925 Change-Id: I16f17e6de1624f7a40b16641122103edc0f5bb64
* | Fix crash in Curves modulenicolasroard2012-10-211-0/+4
| | | | | | | | | | bug:7379140 Change-Id: I26f30d24eb8cf2db9248f29549d8b435d941a325
* | Fix several issues with crop/straightennicolasroard2012-10-212-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | bug:7386266 bug:7386270 bug:7385727 - use a transparent white for the bounds instead of green - add "rule of third" lines to the crop tool - improves preview image quality for geometric operations Change-Id: I94c233e7ea89d67451e7808fb71537d03a1c183d
* | Only translate the main panel if we have to.nicolasroard2012-10-213-2/+25
| | | | | | | | | | bug:7386882 Change-Id: Ib670eb4e513f0bbebd3ecca052fe27180dcf5fdc
* | Revert partially CL ↵nicolasroard2012-10-211-0/+19
|/ | | | | | | https://googleplex-android-review.googlesource.com/#/c/243614/ bug:7384984 Change-Id: Id10c7ac08cc7aab4d2f4b19c88b20d0f3369807a
* Fix for active action bar in cameraDoris Liu2012-10-191-0/+3
| | | | | | Bug: 7377404 Bug: 7384972 Change-Id: Ic54a7501ed3e2a61fab272461dee474b693c8f3a
* Adds a tiny planet (stereographic projection) image filter.Sascha Haeberling2012-10-193-29/+40
| | | | | | | | | Bug: 7293391 Also fixes an issue where the preview value was statically set to 100. This adds a preview parameter value that can be set for this purpose. Change-Id: I68c4ec04e86ab8a29ef7f561e5f21a298003677e
* Add the infrastructure to support Tiny PlanetJohn Hoford2012-10-197-4/+58
| | | | | bug:7293391 Change-Id: I25d95b78a832fa5f20b661e13c4028041517da19
* Fix delete and undo behavior on filmstripBobby Georgescu2012-10-193-5/+10
| | | | | Bug: 7353749 Change-Id: Ib0abd3f71783c01b1df418dd76e674bf05e65ce7
* Merge "Improves swipe gesture" into gb-ub-photos-archesnicolasroard2012-10-193-74/+66
|\
| * Improves swipe gesturenicolasroard2012-10-193-74/+66
| | | | | | | | | | | | | | | | | | | | bug:7379463 - better timings - add original label - remove the gesture detector from ImageZoom (use the parent's one) Change-Id: Ib6879e471dfc21cb3a112aa36a61cd304516cf7f
* | Remove progress bar when switching to grid mode.George Mount2012-10-191-0/+4
| | | | | | | | | | | | Bug 7377975 Change-Id: I388fdf6c6c9a5ffa64e10f864806a8131e53a009
* | Re-enable crop for new panoramaMangesh Ghiware2012-10-191-1/+0
| | | | | | | | | | Bug: 7326215 Change-Id: Ic7a87baceb8aff6247d40b91d4c60cd47c86c377
* | Merge "Fix geometry xforms & minor bug." into gb-ub-photos-archesRuben Brunk2012-10-194-19/+26
|\ \
| * | Fix geometry xforms & minor bug.Ruben Brunk2012-10-194-19/+26
| |/ | | | | | | | | | | | | | | | | Bug: 7376048 Fixed geometry transform. Fixed minor bug where the foldername for saved edited images was incorrect. Change-Id: Icb3156f02b7db7b50a455aaa31ee70832e3fdca8
* | Merge "Saner behavior when deleting in filmstrip mode" into gb-ub-photos-archesBobby Georgescu2012-10-191-2/+1
|\ \
| * | Saner behavior when deleting in filmstrip modeBobby Georgescu2012-10-191-2/+1
| |/ | | | | | | | | Bug: 7353749 Change-Id: Ic9854d205fe5ab76dd1cfe78fee314e93e1ace55
* / Fix sharing state in Gallery ActionBarMangesh Ghiware2012-10-191-0/+6
|/ | | | | Bug: 7340067 Change-Id: I4ff9577315fc743f6b9fef0d325b0743546f108e
* Improves Curves & Crop UInicolasroard2012-10-187-37/+302
| | | | | | | | | | | | bug:7361722 - Use new assets - Add a margin - Add a popup menu - Add a new button showing the current channel - Add popup menu, new assets, new button for Crop as well Change-Id: I0e09098e3135d2213f7f4cd64cd75a3a518a07da
* Merge "Adding support for tiny planet in gallery" into gb-ub-photos-archesDoris Liu2012-10-183-8/+35
|\
| * Adding support for tiny planet in galleryDoris Liu2012-10-183-8/+35
| | | | | | | | | | Bug: 7344427 Change-Id: I6fad734b28022f45cc551d81212ee4d3a0c867b2
* | Merge "Fix Gallery crash" into gb-ub-photos-archesBobby Georgescu2012-10-181-1/+4
|\ \
| * | Fix Gallery crashBobby Georgescu2012-10-181-1/+4
| |/ | | | | | | | | Bug: 7268985 Change-Id: I88c823d3270cb74d6e2bd7df5b6b6ed9e28f16a6
* / DO NOT MERGEScott Main2012-10-181-22/+0
|/ | | | | | | | | | | cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 remove old fashioned Dream, no longer supported Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8 Conflicts: AndroidManifest.xml
* Merge "Do not show "Filmstrip view" text when photo is fullscreen" into ↵Bobby Georgescu2012-10-181-1/+9
|\ | | | | | | gb-ub-photos-arches
| * Do not show "Filmstrip view" text when photo is fullscreenBobby Georgescu2012-10-181-1/+9
| | | | | | | | | | Bug: 243374 Change-Id: I2d0a1d56e6c2d833d9d75041b30afcb988635c49
* | Save XMP & Exif data on edited photosJohn Reck2012-10-185-79/+195
| | | | | | | | | | | | | | | | Bug: 7293391 Bug: 7329199 Bug: 7376660 Change-Id: I23b1637a9a494c1dc43b1fc1359cdaf3e75bc23f
* | Fix undo/redo/back button behaviour with effects and enable historynicolasroard2012-10-1813-118/+251
|/ | | | | | | bug:7332980 bug:7357734 bug:7325872 Change-Id: Ie952a410c218c91ac927095ddcf542209fe7b90c