summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app
Commit message (Collapse)AuthorAgeFilesLines
* Add initial implementation of MediaCache.George Mount2013-03-291-3/+2
| | | | Change-Id: I94d357bab0e57cc60b8be790d912ba036730298b
* Revert "New loading model"John Reck2013-03-214-6/+6
| | | | Change-Id: I5d3d4c7a4ca0d11de01278529e1413fc62e6b4ed
* Add many contextual actions to new galleryBobby Georgescu2013-03-142-5/+5
| | | | 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-122-3/+19
| | | | Change-Id: Ib3e7dfb8948e99541f6d492c7d7bd4bfbad1e53d
* Add possibility for UX improvement measurementsBobby Georgescu2013-02-253-1/+22
| | | | | Bug: 4293199 Change-Id: I45f8a63c676c8d7700c422a0a18f799fb6d02d2e
* Replace various BitmapPools with a smarter unified poolBobby Georgescu2013-02-222-11/+4
| | | | | | | | 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
* DO NOT MERGE: Don't call requestLayout from onLayoutMarco Nelissen2013-02-121-4/+0
| | | | | | | | | | | | | | Doing a layout within a layout can lead to various problems, so it should be avoided. There's some logging that warns of this, which got triggered by CommonControllerOverlay. I don't know what problem this code was originally trying to solve, but it doesn't seem to be necessary anymore. The line in question was originally introduced in change 209a9163d4e8cee0bfe162ae598ef40e6051479c, in Oct 2011. Note: This has been checked into master, this is just cherry picking into Bryce branch. Change-Id: I7651304491a90e8d130f4a0a3b3de8e29c4d0116
* Change transition from Gallery to FiltershowBobby Georgescu2013-02-081-1/+1
| | | | | Bug: 8163894 Change-Id: Iaed600df39a88b176cb8ed3316d187c26c6b7961
* CleanupJohn Reck2013-02-051-5/+0
| | | | | | | Move Canvas to com.android.photos.canvas Remove workaround for b/8079561 Change-Id: I14b832d5935eb8704e96e5591c58f33a7cd4de31
* Add comment about MenuExecutor assumptions in BatchServiceBobby Georgescu2013-01-291-0/+3
| | | | | Bug: 7998915 Change-Id: Ibb73585bf2f81b4a1daadfeb814828ec7b55441d
* Merge "Launching gallery shows browse ui on canvas" into gb-ub-photos-bryceJohn Reck2013-01-291-0/+5
|\
| * Launching gallery shows browse ui on canvasJohn Reck2013-01-281-0/+5
| | | | | | | | Change-Id: I3a5e63ce354ac8e3f3c60e4dc86cfa4432026622
* | Fix ANRs due to waiting for IO on UI threadBobby Georgescu2013-01-282-6/+2
|/ | | | | Bug: 7998915 Change-Id: I938145a7072170f713099a04578f98951b35cbab
* Tweaks for canvasJohn Reck2013-01-183-3/+33
| | | | Change-Id: I9aecf757047f93159212441e5317ef2b3b304a70
* New loading modelJohn Reck2013-01-164-6/+6
| | | | | | | | | | | | | Rename reload() to loadIfDirty() loadIfDirty is implemented by MediaSet and is final loadIfDirty is now blocking instead of async Subclasses must implement two protected methods, isDirtyLocked() and load() The change from async reload() to sync loadIfDirty() should be fine since all users of reload() were doing so from a background thread already, and the longest load() is PicasaAlbumSet which is still a fairly brisk 40ms or so Change-Id: If5cc596a1c13e52e5f4efff1a144bd086d37cfb7
* Replace camera importerBobby Georgescu2013-01-075-68/+23
| | | | 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-182-1/+10
| | | | | | | | | | | | 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.
* Merge "remove actionbar sherlock" into gb-ub-photos-bryceJohn Reck2012-12-1212-66/+54
|\
| * remove actionbar sherlockJohn Reck2012-12-1212-66/+54
| | | | | | | | Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
* | Merge "Remove LongSpareArray + some cleanups" into gb-ub-photos-bryceYour Name2012-12-111-3/+2
|\ \ | |/ |/|
| * Remove LongSpareArray + some cleanupsYour Name2012-12-111-3/+2
| | | | | | | | Change-Id: If5bb44ebca70bd735e426aeb3d9aac2d4bac646e
* | GL packaging refactorJohn Reck2012-12-116-8/+8
|/ | | | Change-Id: I1d7a95c4f0b91a5ba59030d57cf6865c11b497aa
* Removed old crop.Ruben Brunk2012-12-063-1052/+15
| | | | | Bug: 7441237 Change-Id: I29801f798a1d1ad3af81a82950edbb8a72ccae82
* Added support for Crop extras. Wallpaper & Widget use editor crop.Ruben Brunk2012-12-061-1/+2
| | | | | | Bug: 7561976 Bug: 7441237 Change-Id: I0d6644171177650568ed911fc63c0c7e104f8d8c
* 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
* | Move MenuExecutor operations into ServiceBobby Georgescu2012-12-034-5/+91
| | | | | | | | | | Bug: 6680729 Change-Id: I538bb0a8783f7c1ff467ba8d8eb0deefdc0b6ea2
* | Merge "AlbumDataLoader.get returns correct value if not in cache" into ↵Bobby Georgescu2012-11-281-2/+1
|\ \ | | | | | | | | | gb-ub-photos-bryce
| * | AlbumDataLoader.get returns correct value if not in cacheBobby Georgescu2012-11-271-2/+1
| | | | | | | | | | | | | | | Bug: 7621656 Change-Id: I8b73837f41bf4ac8c753a5d84f251219fde8ae75
* | | resolved conflicts for merge of 3c6a0610 to gb-ub-photos-bryceYour Name2012-11-272-89/+20
|\ \ \ | |/ / |/| / | |/ Change-Id: Iac3fcc4a4b8c0295ec53edf5658169fb5fab021e
| * Remove orientation compensationYour Name2012-11-272-89/+20
| | | | | | | | | | | | Bug: 7446056 Change-Id: I6f00617c890961e4d56545406bac9682356c0b15
* | Video: Fix crash in trimming/muting video in GB.Teng-Hui Zhu2012-11-163-29/+35
| | | | | | | | | | | | | | | | | | Basically switched to use sherlock actionbar and protect various new methods with API level check. bug:7546257 Change-Id: Ic16f75126c619578a9e9c2520fa264687d89a2e6
* | Merge "Video: Add the mute functionality." into gb-ub-photos-bryceTeng-Hui Zhu2012-11-164-123/+165
|\ \
| * | Video: Add the mute functionality.Teng-Hui Zhu2012-11-144-123/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-022-1/+10
| | | | | | | | | | | | | | | | | | 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-057-9/+51
| | | | | | | | | | 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
| * Merge "DO NOT MERGE: Do not set the background to null for video." into ↵Tenghui Zhu2012-10-301-21/+1
| |\ | | | | | | | | | gb-ub-photos-arches
| | * DO NOT MERGE: Do not set the background to null for video.Romain Guy2012-10-301-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #7275145 Bug 7405595 Removing the window background when it's not visible is a good idea to save on performance. Removing *all* the backgrounds is just a silly idea that leads to weird looking results that drive graphics engineers mad for a day until they figure out that everything is working properly and that the app is simply asking the system to draw whatever garbage is left in the GPU's graphics buffers. Cherry pick the Romain's change from jb-mr1-dev: https://googleplex-android-review.googlesource.com/#/c/234571/ Change-Id: Ief88821319989add5fda57ae7b69cdb01f6ccdf4
* | | Use the system-standard long press vibration patternBobby Georgescu2012-10-313-22/+10
| | | | | | | | | | | | | | | Bug: 7216819 Change-Id: I575868583777a7a953d767d0cdaa91a439d908ff
* | | Merge "Fix jank on videoplayer auto-exit" into gb-ub-photos-bryceBobby Georgescu2012-10-311-1/+1
|\ \ \
| * | | Fix jank on videoplayer auto-exitBobby Georgescu2012-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 7344292 Change-Id: I3af95d3370769a6465644fa4aabe3f2ffa2980e7
* | | | Gingerbread support-ishJohn Reck2012-10-3112-52/+55
|/ / / | | | | | | | | | | | | | | | This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca. Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
* | | am c7536cfa: Merge "Show sync error toast only when both loading and syncing ↵Bart Sears2012-10-307-15/+58
|\| | | | | | | | | | | | | | | | | | | | are done." into gb-ub-photos-arches * commit 'c7536cfa819d10e0c556ecb30c53a58c048fa327': Show sync error toast only when both loading and syncing are done.