summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app/PhotoPage.java
Commit message (Collapse)AuthorAgeFilesLines
* Gallery2: Make Gallery2 support OMADRM featureParamananda Pradhan2015-09-151-4/+175
| | | | | | - Make Gallery2 can recognize and consume DRM images and videos. Change-Id: I1655d295bcec31b5760c2c86c06f815cf6ed57ee
* Revert OMADRM feature.staging/cm-12.1Steve Kondik2015-03-281-171/+4
| | | | | | | | | | | | | | * No need for this. Revert "Gallery2 : Added support for Oma drm (CD and SD)" This reverts commit 6144de8cc35fdd114802545c9922a1a234af8397. Revert "Gallery2: Make Gallery2 support OMADRM feature" This reverts commit 9382a979292e52de5c60a39ba24688362dce8bc1. Change-Id: I13a0d69a792aad36d7b15bc0b3c78e3f55d396bc
* Gallery2 : Added support for Oma drm (CD and SD)Paramananda2015-02-111-7/+3
| | | | Change-Id: I9c793f85e255e8fd183197410111de2dc618ca76
* Gallery2: Set PhotoPage GL root reset when rotatekaiyiz2015-01-291-0/+9
| | | | | | | | | | | When there is another activity on top of PhotoPage, the GLRootView will not update to match screen, so the back ground seems corruption. Set GLRoot View resume when onConfigurationChanged happen. CRs-Fixed: 778294 Change-Id: Ib1fd6953462e26f11c3a8957a042db2ad4ecc275
* Gallery2: Make Gallery2 support OMADRM featureParamananda Pradhan2015-01-201-4/+175
| | | | | | - Make Gallery2 can recognize and consume DRM images and videos. Change-Id: I1655d295bcec31b5760c2c86c06f815cf6ed57ee
* Gallery2: Set read only image unEditablekaiyiz2015-01-141-1/+1
| | | | | | | | | | | When get the flag mReadOnlyView true, the menu item of edit is set true, which is not reasonable. Set the menu item of edit false if read only. CRs-Fixed: 768257 Change-Id: I88fb9a76036699b686ec14568ff54aba5523c5ec
* Merge "Gallery2: Fix force close issue when trim video"Linux Build Service Account2015-01-121-2/+10
|\
| * Gallery2: Fix force close issue when trim videoxiaoqiny2014-12-251-2/+10
| | | | | | | | | | | | | | - Only mp4 and 3gp file support trim function Change-Id: I6e254ca6d5445d62b0276695667f4bdb07f9a59c CRs-Fixed: 652838
* | Gallery2: Reginal requirement for RTLkaiyiz2014-11-041-1/+64
| | | | | | | | | | | | | | | | Add RTL logic in load picture, pick picture, show picture, delete picture, load album, pick album, show album, show widget, pick widget, scroll timebar. Change Camera setting to support RTL. Change-Id: Ica264f624e0f20153280066264943882ad22f2db
* | Gallery2: support GIF animationLikai Ding2014-11-041-0/+9
|/ | | | | | | This change implements a Java GIF decoder. Change-Id: I72b6e8eb25572bba77a2a46e1754d8db8c47a0cc Signed-off-by: Xiaojing Zhang <zhangx@codeaurora.org>
* Fix Gallery auto-hide action bar in Album viewnicolasroard2013-10-151-0/+1
| | | | | bug:11218758 Change-Id: Id48e54842ea3539396801d99ea8ec33e58c7a1f1
* Rename Gallery activity and add trampolineMangesh Ghiware2013-09-261-2/+2
| | | | | | Bug: 10807861 Change-Id: Iaaf17b579db2fe09900e9817f766f43dd66dea61
* Prevent edit during view photo intentJohn Hoford2013-09-161-1/+7
| | | | | bug:9862016 Change-Id: I58e64765630f686f49836dbfb7a7447910e714ef
* fix crashes in in gallery by reversing previous clJohn Hoford2013-09-131-17/+0
| | | | | | | | | | cl 348551 tried to fix a long existing bug which but introduced race conditions in the system bug:10652636 bug:10551751 bug:8794694 Change-Id: Ieb617f85df32a5d82293e555621a7e44b8b84708
* fix Gallery crash while deleting a pictureJohn Hoford2013-09-061-1/+2
| | | | | bug:10551751 Change-Id: I9b6a8488b4fa2a3440b85ae8e4c5dc3da83e29f1
* Show the action bar and edit button when system clear full screen flag.ztenghui2013-08-301-0/+17
| | | | | | bug:10421879 Change-Id: I2cb4f80685e8feb4ee694ed865d724ccc33c3874
* Prevent slide show request with only on slideJohn Hoford2013-08-231-0/+16
| | | | | bug:8794694 Change-Id: Id3354733c7f35d9303b01f07ddf30f5555b07ddd
* Fix the Google Drive issueztenghui2013-08-201-0/+3
| | | | | | | | | Here a local cache file will be downloaded and sent over to Gallery / Editor. So we need to handle that well. bug:9356969 Change-Id: Ic09a2f5de2c9c55ca2ed21c77ddf7517f5939bfb
* Add printing to Gallerynicolasroard2013-08-191-0/+4
| | | | Change-Id: I26aad645759f95813003badffbd03845e0df37bb
* Fix RTE in PhotoPageMangesh Ghiware2013-08-191-5/+2
| | | | | Bug: 10341736 Change-Id: Iff005411cff8f8923c465da99804c14a3783bcf9
* Remove Camera from Gallery2.Sascha Haeberling2013-08-081-71/+5
| | | | Change-Id: I89adebffcacd1269217d7bd8c630c2f78886f590
* Make sure we don't add the pano sharing menu in the secure lock screen.Sascha Haeberling2013-04-221-3/+5
| | | | | | Bug: 8473022 Change-Id: Ie2221b6a660b7c9dc39cef89a509da4b2659adb3
* Remove unused imports.Flavio Lerda2013-04-181-4/+0
| | | | | | | | This is follow-up on the previous fix for b/8433834, addressing reviewer comments. Bug: 8433834 Change-Id: I06f466704175a62d8febc5be471a2ca1f50e898d
* Gallery crop uses new activity. Fixed image quality.Ruben Brunk2013-04-181-2/+3
| | | | | | | | | | | | Bug: 8639287 Bug: 8617799 Bug: 8600483 Bug: 8586301 Bug: 8526929 Bug: 8181859 Bug: 7561681 Change-Id: Ib275b970931dd324e93d1629be75e5309c9dcb4e
* Usage statistics for sharing.Flavio Lerda2013-04-171-2/+31
| | | | | Bug: 8433834 Change-Id: Iaec6150443258daa213395b6fb1e8d8d3e6123b3
* Add menu item to start the simple editornicolasroard2013-04-081-0/+27
| | | | Change-Id: Iac3ca76838a5f91186527863b3d990cbcad3faf0
* Add many contextual actions to new galleryBobby Georgescu2013-03-141-1/+1
| | | | Change-Id: Ied57636c7bf0804ad015ddc664e177633c549e08
* Add coarse grained events for camera mode, filmstrip statsBobby Georgescu2013-03-131-0/+4
| | | | Change-Id: I9c48f1646e9dff44efd27180065a6435110c5d16
* Usage statistics collection for camera module, filmstripBobby Georgescu2013-03-121-0/+10
| | | | Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d
* Change transition from Gallery to FiltershowBobby Georgescu2013-02-081-1/+1
| | | | | Bug: 8163894 Change-Id: Iaed600df39a88b176cb8ed3316d187c26c6b7961
* Fix ANRs due to waiting for IO on UI threadBobby Georgescu2013-01-281-3/+1
| | | | | Bug: 7998915 Change-Id: I938145a7072170f713099a04578f98951b35cbab
* Tweaks for canvasJohn Reck2013-01-181-0/+6
| | | | Change-Id: I9aecf757047f93159212441e5317ef2b3b304a70
* Replace camera importerBobby Georgescu2013-01-071-11/+0
| | | | Change-Id: Icfeb23301bc6c9f8c8b12824bcbb0d8b41852d07
* Fix camera->gallery relaunch loop on empty camera albumBobby Georgescu2013-01-071-1/+1
| | | | | Bug: 7952132 Change-Id: I27325abe32177195d07fe310b8c49aca81af9056
* Lock icon in secure album should redirect to gallery after unlock.Wu-cheng Li2012-12-181-1/+3
| | | | | | | | | | | | Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up when launching gallery. bug:7462572 Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0 The auto-merge of this CL from Arches to Bryce had a merge conflict, so I canceled the auto-merge and then did this manual cherry-pick.
* remove actionbar sherlockJohn Reck2012-12-121-4/+3
| | | | Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
* am db99a10b: Fix NPE in PhotoPageBobby Georgescu2012-12-051-1/+3
|\ | | | | | | | | * commit 'db99a10b6ac9296d612db8ba51e37f141fee4170': Fix NPE in PhotoPage
| * Fix NPE in PhotoPageBobby Georgescu2012-12-041-1/+3
| | | | | | | | | | Bug: 7673141 Change-Id: I264f28d127f47e5f4f8c6a7c2df1c021401d03f2
* | resolved conflicts for merge of 3c6a0610 to gb-ub-photos-bryceYour Name2012-11-271-8/+1
|\| | | | | | | Change-Id: Iac3fcc4a4b8c0295ec53edf5658169fb5fab021e
| * Remove orientation compensationYour Name2012-11-271-8/+1
| | | | | | | | | | | | Bug: 7446056 Change-Id: I6f00617c890961e4d56545406bac9682356c0b15
* | Merge "Video: Add the mute functionality." into gb-ub-photos-bryceTeng-Hui Zhu2012-11-161-0/+6
|\ \
| * | Video: Add the mute functionality.Teng-Hui Zhu2012-11-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Enable the mute video functionality. 2. Consolidate the sharing code, especially for file handling. bug:7543943 Change-Id: Ie7ec605996bc3242b1a50385f506e6a50ee2d2fc
* | | Fix UnsupportedOperationException in MediaObjectDoris Liu2012-11-121-1/+6
|/ / | | | | | | | | Bug: 6495745 Change-Id: I770833f0c3fec6f187e961f511a7d9d2591f5f97
* | am 9ec5de9d: Fix scenario where launching Gallery launches CameraBobby Georgescu2012-11-061-1/+2
|\| | | | | | | | | * commit '9ec5de9dbf46caecd2f0b38a72d31fa37ecb0466': Fix scenario where launching Gallery launches Camera
| * Fix scenario where launching Gallery launches CameraBobby Georgescu2012-11-061-1/+2
| | | | | | | | | | Bug: 7479102 Change-Id: Ib4676a7149c659897eee1dbbb92ab09861bd0ed4
| * Lock icon in secure album should redirect to gallery after unlock.Wu-cheng Li2012-11-021-1/+3
| | | | | | | | | | | | | | | | | | Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up when launching gallery. bug:7462572 Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0
* | Split PhotoPage into FilmstripPage and SinglePhotoPageBobby Georgescu2012-11-051-2/+2
| | | | | | | | | | Bug: 7479348 Change-Id: I98f668bd00e2e09bda9d5d9965fdbdaf1b832bfa
* | am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into ↵Bart Sears2012-11-011-3/+6
|\| | | | | | | | | | | | | gb-ub-photos-arches * commit '40bb7158b8bda53433b36b94d6efed0e3937dcf2': Jump to lockscreen in secure album if tap on video
| * Jump to lockscreen in secure album if tap on videoAngus Kong2012-11-011-3/+6
| | | | | | | | | | bug:7454356 Change-Id: I1e7e9ed886d414d5b41abdb1cc1d00c7736ae006
* | Gingerbread support-ishJohn Reck2012-10-311-3/+4
|/ | | | | | This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca. Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 12:03:32 +0000