summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ui
Commit message (Collapse)AuthorAgeFilesLines
* This removes all non-Camera stuff from Camera2.Sascha Haeberling2013-08-0652-13598/+0
| | | | | | | Note: Camera2 is a clone of Gallery2 right now. Note 2: I will bring .mk files back later. Change-Id: Ida958654296f5ebaacb6bb0ff59d52a7c37ce6fc
* Fix NPE in PreparePageFadeoutTextureBobby Georgescu2013-06-071-0/+4
| | | | | Bug: 8837688 Change-Id: Ie8fbd9a42497195b8a01cc5638cb0c44d4532d09
* Fix graphical corruption due to tear down raceJohn Reck2013-06-051-0/+3
| | | | | | Bug: 9278945 Change-Id: I7594680322768f60eaed8a1037d139cbadf9706b
* am aa77f39a: Merge "Fix camera controls blink on startup" into ↵Doris Liu2013-05-211-0/+5
|\ | | | | | | | | | | | | gb-ub-photos-bryce * commit 'aa77f39a3a18ee7945177189c358ef6208e6da2b': Fix camera controls blink on startup
| * Fix camera controls blink on startupDoris Liu2013-05-201-0/+5
| | | | | | | | | | Bug: 9052837 Change-Id: Ie15b812c6e6e7879d29d96a345173a2130b2fe91
* | am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryceJohn Reck2013-05-161-3/+2
|\| | | | | | | | | * commit '3b7347daf572c20996607afe4cc32f9a96f8fe5d': Switch back to old crop
| * Switch back to old cropJohn Reck2013-05-161-3/+2
| | | | | | | | | | | | Bug: 8950255 Change-Id: I3f78901e65a17a1d5867d3f76a6031cff5f65fed
* | am ac94740c: Remove GL dependency on unused stencil buffers.George Mount2013-05-092-162/+5
|\| | | | | | | | | * commit 'ac94740cd673a016542d803c8600633c99b7427e': Remove GL dependency on unused stencil buffers.
| * Remove GL dependency on unused stencil buffers.George Mount2013-05-092-162/+5
| | | | | | | | | | | | Bug 8884435 Change-Id: I8e7f0563a4a901953e3e2b14e35457b4fefe2e34
* | am 5a352be0: Increase selection limitBobby Georgescu2013-05-011-1/+1
|\| | | | | | | | | * commit '5a352be0df79b03c942eb67a799ddb3aaa1a26a2': Increase selection limit
| * Increase selection limitBobby Georgescu2013-05-011-1/+1
| | | | | | | | | | | | | | Bug: 8606565 Bug: 8721237 Bug: 8752803 Change-Id: I578536389146fb4d8735c8171ec346ebe49de729
* | am faf2f040: Fix multi selection issueBobby Georgescu2013-04-221-5/+9
|\| | | | | | | | | * commit 'faf2f040f38532213fa237cf45c9794cf1a85859': Fix multi selection issue
| * Fix multi selection issueBobby Georgescu2013-04-191-5/+9
| | | | | | | | | | Bug: 8663155 Change-Id: Ic6aa98c04b5134df9deb1b14736e614bf1618f03
* | Re-enable Simple Editor menu itemnicolasroard2013-04-161-1/+1
|/ | | | Change-Id: I080dfffeb6394b78a1dc2bd10b52ff15b1e55ac9
* Remove the Simple Edit menu item in Gallerynicolasroard2013-04-161-1/+1
| | | | | bug:8609003 Change-Id: Ida6bfec65bf4b78c7c1b64f759c750ef9255bb6c
* Fix performance and other issues related to multi-selectionBobby Georgescu2013-04-122-25/+68
| | | | | | Bug: 8606565 Bug: 8607510 Change-Id: I5bd01745b6d1047571d562e1637a2999afddfec2
* Add menu item to start the simple editornicolasroard2013-04-081-0/+1
| | | | Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0
* Usage statistics collection for camera module, filmstripBobby Georgescu2013-03-121-0/+9
| | | | Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d
* Replace various BitmapPools with a smarter unified poolBobby Georgescu2013-02-228-67/+30
| | | | | | | | Make all of gallery use a single shared pool, and pave the way for making the pool more adaptive based on the current workload. Change-Id: Ia32561ad50b1b9716ebe2fd32a7bf02737685dac
* 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