summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app
Commit message (Expand)AuthorAgeFilesLines
* Merge "AlbumDataLoader.get returns correct value if not in cache" into gb-ub-...Bobby Georgescu2012-11-281-2/+1
|\
| * AlbumDataLoader.get returns correct value if not in cacheBobby Georgescu2012-11-271-2/+1
* | resolved conflicts for merge of 3c6a0610 to gb-ub-photos-bryceYour Name2012-11-272-89/+20
|\ \ | |/ |/|
| * Remove orientation compensationYour Name2012-11-272-89/+20
* | Video: Fix crash in trimming/muting video in GB.Teng-Hui Zhu2012-11-163-29/+35
* | 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
* | | Fix UnsupportedOperationException in MediaObjectDoris Liu2012-11-121-1/+6
|/ /
* | am 9ec5de9d: Fix scenario where launching Gallery launches CameraBobby Georgescu2012-11-061-1/+2
|\|
| * Fix scenario where launching Gallery launches CameraBobby Georgescu2012-11-061-1/+2
| * Lock icon in secure album should redirect to gallery after unlock.Wu-cheng Li2012-11-022-1/+10
* | Split PhotoPage into FilmstripPage and SinglePhotoPageBobby Georgescu2012-11-057-9/+51
* | am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into ...Bart Sears2012-11-011-3/+6
|\|
| * Jump to lockscreen in secure album if tap on videoAngus Kong2012-11-011-3/+6
| * Merge "DO NOT MERGE: Do not set the background to null for video." into gb-ub...Tenghui Zhu2012-10-301-21/+1
| |\
| | * DO NOT MERGE: Do not set the background to null for video.Romain Guy2012-10-301-21/+1
* | | Use the system-standard long press vibration patternBobby Georgescu2012-10-313-22/+10
* | | 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
* | | | Gingerbread support-ishJohn Reck2012-10-3112-52/+55
|/ / /
* | | am c7536cfa: Merge "Show sync error toast only when both loading and syncing ...Bart Sears2012-10-307-15/+58
|\| |
| * | Show sync error toast only when both loading and syncing are done.Hung-ying Tyan2012-10-307-15/+58
| |/
* | Merge "Gallery: Do not set the background to null for video." into gb-ub-phot...Teng-Hui Zhu2012-10-301-21/+0
|\ \
| * | Gallery: Do not set the background to null for video.Teng-Hui Zhu2012-10-301-21/+0
* | | Disable save button when there's no modificationDoris Liu2012-10-291-12/+13
| |/ |/|
* | Show panoViewer icon after "Back" from viewerDoris Liu2012-10-261-1/+2
|/
* Add proxy launcherJohn Reck2012-10-251-56/+10
* Handle 360 panorama specific MIME type.Mangesh Ghiware2012-10-251-2/+5
* Remove the old photo editornicolasroard2012-10-241-7/+0
* Merge "Initialize the modified date correctly." into gb-ub-photos-archesTeng-Hui Zhu2012-10-241-6/+9
|\
| * Initialize the modified date correctly.Teng-Hui Zhu2012-10-241-6/+9
* | Launch built-in camera app via filmstripBobby Georgescu2012-10-241-2/+9
|/
* Do not show bottom controls when undo bar is visibleBobby Georgescu2012-10-241-1/+6
* Do not show Camera placeholder when not appropriateBobby Georgescu2012-10-231-9/+10
* Stay in AlbumPage when dismissing a popup from APDoris Liu2012-10-232-8/+7
* Fix jank when launching editor from Camera filmstripBobby Georgescu2012-10-232-0/+9
* Merge "Fix NPE in detecting panoramas." into gb-ub-photos-archesGeorge Mount2012-10-231-3/+7
|\
| * Fix NPE in detecting panoramas.George Mount2012-10-231-3/+7
* | Show Panorama viewer button in filmstrip modeBobby Georgescu2012-10-231-2/+3
* | Ensure photo sphere icon shows for panoramas.George Mount2012-10-231-0/+1
|/
* Merge "Scroll to placeholder in gallery filmstrip launches camera" into gb-ub...Bobby Georgescu2012-10-221-3/+13
|\
| * Scroll to placeholder in gallery filmstrip launches cameraBobby Georgescu2012-10-221-3/+13
* | 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
* | Better transition between Gallery and editorBobby Georgescu2012-10-221-0/+7
|/
* Fix for active action bar in cameraDoris Liu2012-10-191-0/+3
* Fix delete and undo behavior on filmstripBobby Georgescu2012-10-192-3/+7
* Remove progress bar when switching to grid mode.George Mount2012-10-191-0/+4
* Merge "Fix geometry xforms & minor bug." into gb-ub-photos-archesRuben Brunk2012-10-191-1/+1
|\
| * Fix geometry xforms & minor bug.Ruben Brunk2012-10-191-1/+1