summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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-169-124/+339
|\ \
| * | Video: Add the mute functionality.Teng-Hui Zhu2012-11-149-124/+339
* | | am 18b38883: Guard tiles by synchronized block.Angus Kong2012-11-151-40/+52
|\ \ \ | | |/ | |/|
| * | Guard tiles by synchronized block.Angus Kong2012-11-141-40/+52
* | | Remove import exiftagsEarl Ou2012-11-141-1/+0
* | | use ExifReader in MediaDetailsEarl Ou2012-11-141-18/+41
* | | use ExifParser in ImageLoaderEarl Ou2012-11-141-3/+22
* | | Use getValueAt() to read different data in ExifTagEarl Ou2012-11-141-1/+1
* | | Fix UnsupportedOperationException in MediaObjectDoris Liu2012-11-121-1/+6
| |/ |/|
* | use ExifParser to parse the orientaionEarl Ou2012-11-071-125/+36
* | 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
* | Load correct localized album names after language changeBobby Georgescu2012-11-052-6/+3
* | Adding AccessibilityUtils classDoris Liu2012-11-051-0/+54
* | am 25fab805: Merge "Fix extra gray item in secure album." into gb-ub-photos-a...George Mount2012-11-011-4/+9
|\|
| * Merge "Fix extra gray item in secure album." into gb-ub-photos-archesGeorge Mount2012-11-011-4/+9
| |\
| | * Fix extra gray item in secure album.George Mount2012-11-011-4/+9
* | | am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into ...Bart Sears2012-11-011-3/+6
|\| |
| * | Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-...Bart Sears2012-11-011-3/+6
| |\ \
| | * | Jump to lockscreen in secure album if tap on videoAngus Kong2012-11-011-3/+6
| | |/
* | | am 769d38db: Fix tiny planet not using XMP metadata anymoreSascha Haeberling2012-11-011-9/+8
|\| |
| * | Fix tiny planet not using XMP metadata anymoreSascha Haeberling2012-10-311-9/+8
| |/
| * 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
* | | Disable operations when no item is selectedDoris Liu2012-10-311-0/+9
* | | 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-3116-65/+73
|/ / /
* | | am c7536cfa: Merge "Show sync error toast only when both loading and syncing ...Bart Sears2012-10-307-15/+58
|\| |
| * | Merge "Show sync error toast only when both loading and syncing are done." in...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
* | | am aa8228a4: Merge "Don\'t use an album for UriImages." into gb-ub-photos-archesGeorge Mount2012-10-301-32/+0
|\| |
| * | Don't use an album for UriImages.George Mount2012-10-291-32/+0
| |/
* | 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-293-13/+24
| |/ |/|
* | Reset rotation flagnicolasroard2012-10-291-1/+1
* | Merge "Fix zooming position" into gb-ub-photos-archesnicolasroard2012-10-294-29/+180
|\ \
| * | Fix zooming positionnicolasroard2012-10-284-31/+180
* | | Do not copy XMP data if it has TinyPlanet filterJohn Hoford2012-10-281-0/+4
* | | Fix rounding issue affecting TinyPlanetnicolasroard2012-10-271-3/+6
|/ /
* | Merge "Changed rotated display parameter increments to 90." into gb-ub-photos...Nicolas Roard2012-10-261-1/+1
|\ \
| * | Changed rotated display parameter increments to 90.Ruben Brunk2012-10-261-1/+1
* | | Merge "change thumbnail and reset behaviour" into gb-ub-photos-archesNicolas Roard2012-10-262-11/+43
|\ \ \