summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ui
Commit message (Collapse)AuthorAgeFilesLines
* Fix ANRs due to waiting for IO on UI threadBobby Georgescu2013-01-281-2/+12
| | | | | Bug: 7998915 Change-Id: I938145a7072170f713099a04578f98951b35cbab
* Fix slide show animation so that cross fades work.George Mount2013-01-091-4/+0
| | | | | | | | | | | Bug 7961297 Removed the "Additive" blending, which didn't do anything, even in OpenGL ES 1.1 implementation. Modified the texturing to change the color of the pixels based on the supplied alpha rather than modifying the alpha. This appears to match the implementation in the OpenGL ES 1.1 pipeline. Change-Id: I52491af1a8a2d727968e4e805bc4bc61647f5cf2
* Merge "Instantiate GLCanvas rather than reinitialize current GLCanvas." into ↵George Mount2013-01-083-7/+7
|\ | | | | | | gb-ub-photos-bryce
| * Instantiate GLCanvas rather than reinitialize current GLCanvas.George Mount2013-01-083-7/+7
| | | | | | | | | | | | | | GLCanvas was being used as a singleton when it really should allow separate instances for correctness. Change-Id: I650884e843a4a78997b70826f6012ae19b8df549
* | Replace camera importerBobby Georgescu2013-01-074-71/+2
|/ | | | Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07
* Merge "remove actionbar sherlock" into gb-ub-photos-bryceJohn Reck2012-12-124-18/+13
|\
| * remove actionbar sherlockJohn Reck2012-12-124-18/+13
| | | | | | | | Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
* | Merge "Remove LongSpareArray + some cleanups" into gb-ub-photos-bryceYour Name2012-12-114-59/+56
|\ \ | |/ |/|
| * Remove LongSpareArray + some cleanupsYour Name2012-12-114-59/+56
| | | | | | | | Change-Id: If5bb44ebca70bd735e426aeb3d9aac2d4bac646e
* | GL packaging refactorJohn Reck2012-12-1150-4664/+70
|/ | | | Change-Id: I1d7a95c4f0b91a5ba59030d57cf6865c11b497aa
* am 695e1aa0: Force a layout pass if the display rotation changesJohn Reck2012-12-101-1/+5
|\ | | | | | | | | * commit '695e1aa059cbc2cb2988f6beb0fee8ff7952b229': Force a layout pass if the display rotation changes
| * Force a layout pass if the display rotation changesJohn Reck2012-12-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7687209 DisplayRotation is used to map camera orientation to the display and is updated in layoutContentPane(). However, in the case of a 180 rotate framework doesn't send an onConfigurationChanged nor does the layout dimensions change, thus layoutContentPane doesn't fire and we don't update mDisplayRotation, resulting in an upside-down preview. To handle this, check each draw whether or not the display rotation has changed and if it has force a layout pass. Change-Id: I610ea235d1bf7de2743f4cdb8e42ba1ddcb41404
* | Decode screenshots when they show 0x0 dimensionsDoris Liu2012-12-072-1/+57
| | | | | | | | | | Bug: 7470758 Change-Id: If4012899e120ad68cdc8ca12bf6f8de8c5c96019
* | Removed old crop.Ruben Brunk2012-12-062-795/+0
| | | | | | | | | | Bug: 7441237 Change-Id: I29801f798a1d1ad3af81a82950edbb8a72ccae82
* | Merge "Add GLES20 canvas implementation." into gb-ub-photos-bryceGeorge Mount2012-12-057-55/+1175
|\ \
| * | Add GLES20 canvas implementation.George Mount2012-12-057-55/+1175
| | | | | | | | | | | | Change-Id: I5680909f31dc097599d0e063aa1f6daba834d3e2
* | | am 7a537732: Merge "Prevent Camera UI in Gallery" into gb-ub-photos-archesMichael Kolb2012-12-041-1/+3
|\ \ \ | | |/ | |/| | | | | | | * commit '7a5377322dcebdaad98df9a31cadc7ff0f464d8a': Prevent Camera UI in Gallery
| * | Prevent Camera UI in GalleryMichael Kolb2012-12-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7668856 At startup, the PhotoView wouldn't execute the onFullScreenChanged callback, so the Camera UI believed it was in Camera. Change-Id: I6794c2a5a4eb06d39161a681b7a0afc27d5e4b3f
* | | Move MenuExecutor operations into ServiceBobby Georgescu2012-12-032-3/+19
| |/ |/| | | | | | | Bug: 6680729 Change-Id: I538bb0a8783f7c1ff467ba8d8eb0deefdc0b6ea2
* | Merge "Separate GL calls into GLCanvas in preparation for adding GLES2." ↵George Mount2012-11-3011-230/+390
|\ \ | | | | | | | | | into gb-ub-photos-bryce
| * | Separate GL calls into GLCanvas in preparation for adding GLES2.George Mount2012-11-2011-230/+390
| | | | | | | | | | | | Change-Id: I2756c14294a36af7905766ee650fa08fb95e9477
* | | Improve fling to delete gesture handlingBobby Georgescu2012-11-302-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7419862 Bug: 7301456 Allows flings to start anywhere within the width bounds of the image, even if outside the height bounds, making deletion of panoramas more feasible, and gestures are filtered by length to be able to make flinging easier while still avoiding accidental input. Change-Id: Iac933bfee85865a718ed47eadfed76683eb771d2
* | | Merge "Video: Add the mute functionality." into gb-ub-photos-bryceTeng-Hui Zhu2012-11-161-0/+2
|\ \ \
| * | | Video: Add the mute functionality.Teng-Hui Zhu2012-11-141-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 1. Enable the mute video functionality. 2. Consolidate the sharing code, especially for file handling. bug:7543943 Change-Id: Ie7ec605996bc3242b1a50385f506e6a50ee2d2fc
* | | am 18b38883: Guard tiles by synchronized block.Angus Kong2012-11-151-40/+52
|\ \ \ | |/ / |/| / | |/ | | * commit '18b388839ed9858a3b35cec9a636e5cde58a528a': Guard tiles by synchronized block.
| * Guard tiles by synchronized block.Angus Kong2012-11-141-40/+52
| | | | | | | | | | | | | | Tiles might be touched in different threads. bug:7490351 Change-Id: Ie30d43db90cf63f7a6ec6438faabfcae8bca151a
* | Disable operations when no item is selectedDoris Liu2012-10-311-0/+9
| | | | | | | | | | Bug: 7441208 Change-Id: I2f435ad8aa0b578ecfec426f7ad6287f0f210f48
* | Gingerbread support-ishJohn Reck2012-10-314-13/+18
|/ | | | | | This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca. Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
* Remove black borders in Manta LightCycle capture after orientation change.George Mount2012-10-261-0/+7
| | | | | | Bug 7344906 Change-Id: I70017e4479962d49aedb06ea7b050f638e00fc06
* Merge "Fix the black lines near edge of thumbnails" into gb-ub-photos-archesBobby Georgescu2012-10-261-7/+11
|\
| * Fix the black lines near edge of thumbnailsOwen Lin2012-10-261-7/+11
| | | | | | | | | | | | | | | | | | 1. Correct the positions of right and bottom borders 2. Turn off blending by using PoterDuffMode.SRC bug: 7414307 Change-Id: Icc6fd765c2b1e904308c53aa66b55600e0016471
* | Merge "Hold WakeLock for batch delete operation" into gb-ub-photos-archesBobby Georgescu2012-10-263-31/+80
|\ \ | |/ |/|
| * Hold WakeLock for batch delete operationBobby Georgescu2012-10-253-31/+80
| | | | | | | | | | Bug: 6680729 Change-Id: I0bdd59edb60c746c8c9e3c3608be980247f0d91a
* | Merge "Fix tiling effect when open a photo." into gb-ub-photos-archesHung-ying Tyan2012-10-252-2/+13
|\ \
| * | Fix tiling effect when open a photo.Owen Lin2012-10-252-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Don't draw the tiles of full image before screen nail is ready. 2. Upload multiple tiles in each frame in order to show photo quickly. bug: 7403409 Change-Id: Ic5a88a29fe302068e97ab81ab260d0cc572dd7ff
* | | Merge "Fixed crop intent." into gb-ub-photos-archesRuben Brunk2012-10-251-1/+3
|\ \ \
| * | | Fixed crop intent.Ruben Brunk2012-10-251-1/+3
| | |/ | |/| | | | | | | | | | | | | Bug: 7415140 Bug: 7403813 Change-Id: I545162544f845d210d21185cddaca09b219fb091
* / | Get rid of black lines near edge of thumbnailsBobby Georgescu2012-10-251-2/+2
|/ / | | | | | | | | Bug: 7414307 Change-Id: If77e04945ff6df65301a6802dd40fabc8c329bfa
* | Force renderring request for Camera Animation.Angus Kong2012-10-252-0/+6
| | | | | | | | | | bug:7410862 Change-Id: I439186f2fea5ee0939ddcfcb9d77a49d0047727b
* | Fix attempted uploading of recycled tilesBobby Georgescu2012-10-241-8/+13
| | | | | | | | | | Bug: 7405398 Change-Id: I17711f9c724af216aa22cee6a86d9feba84c1548
* | Do not show bottom controls when undo bar is visibleBobby Georgescu2012-10-241-0/+3
|/ | | | | Bug: 7403458 Change-Id: I1e789ebd7f08256a1ccbdb2ac9f2f9f97d0859c6
* Use TiledTexture for thumbnails.Owen Lin2012-10-248-41/+81
| | | | | | | | | | 1. Use TiledTexture for thumbnails to prevent jank in uploading big thumbnails. (e.g., 512 * 512) 2. Use larger thumbnails (DISPLAY_LONG_SIDE / 5). bug: 7381302 Change-Id: I7661d648373e893b40b2a0304037171760091e00
* Fix NPEJohn Reck2012-10-231-9/+11
| | | | | | Bug: 7399438 Change-Id: Ida0bcc0689d5a797e3c60c3ee51542512fbadf1e
* 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
* | Drive GLRootView with ChoreographerJohn Reck2012-10-221-0/+15
|/ | | | | | | | | 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
* Fix delete and undo behavior on filmstripBobby Georgescu2012-10-191-2/+3
| | | | | Bug: 7353749 Change-Id: Ib0abd3f71783c01b1df418dd76e674bf05e65ce7
* Re-enable crop for new panoramaMangesh Ghiware2012-10-191-1/+0
| | | | | Bug: 7326215 Change-Id: Ic7a87baceb8aff6247d40b91d4c60cd47c86c377
* Saner behavior when deleting in filmstrip modeBobby Georgescu2012-10-191-2/+1
| | | | | Bug: 7353749 Change-Id: Ic9854d205fe5ab76dd1cfe78fee314e93e1ace55
* Remove panorama checks from supported operations.George Mount2012-10-182-20/+98
| | | | | | | | | | Bug 7351383 Bug 7349438 Move panorama support checks from getSupportedOperations so that calls to getSupportedOperations are consistent. Panorama checks are moved to only based on callbacks. Change-Id: Id9ff138204df84c6fb0a4c971dcea59f1220aee2