summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'caf/LA.BR.1.2.3' into caf/cm-12.1caf/cm-12.1Matt Garnes2015-05-0547-729/+825
|\
| * Merge "Gallery2 : Video share option is not working"Linux Build Service Account2015-04-161-3/+5
| |\
| | * Gallery2 : Video share option is not workingParamananda2015-04-161-3/+5
| * | Merge "Gallery2 : Delete and Details options are not visible on Camera preview"Linux Build Service Account2015-04-142-4/+4
| |\|
| | * Gallery2 : Delete and Details options are not visible on Camera previewParamananda2015-04-132-4/+4
| * | Merge "Gallery2 : Drm file can be set as wallpaper"Linux Build Service Account2015-04-081-0/+4
| |\ \
| | * | Gallery2 : Drm file can be set as wallpaperParamananda2015-04-061-0/+4
| | |/
| * | Merge "Gallery2: Gallery2 can't show the newest picture"Linux Build Service Account2015-04-071-0/+10
| |\ \ | | |/ | |/|
| | * Gallery2: Gallery2 can't show the newest picturewangjing2015-04-031-0/+10
| * | Gallery2 : Drm lock icon added on Photo widget for drm contentParamananda2015-04-023-4/+35
| * | Gallery2 : GIF animated drm file can be visible in Gallery appParamananda2015-04-021-0/+20
| * | Gallery2 : Uses internal Drm image decoder api in Gallery appParamananda2015-04-0224-699/+253
| |/
| * Merge "Gallery2: Modify the action of rewind and forward button" into LA.BR.1...Linux Build Service Account2015-03-301-2/+14
| |\
| | * Gallery2: Modify the action of rewind and forward buttonkaiyiz2015-03-231-2/+14
| * | Merge "Gallery2: Fix wake up the screen, the video does not continue to play."Linux Build Service Account2015-03-231-7/+13
| |\ \
| | * | Gallery2: Fix wake up the screen, the video does not continue to play.kaiyiz2015-03-231-7/+13
| | |/
| * / Gallery2: Remove wait when notify dirtykaiyiz2015-03-212-6/+1
| |/
| * Merge "Gallery2: Move files to the correct location"Linux Build Service Account2015-03-196-0/+340
| |\
| | * Gallery2: Move files to the correct locationJay Wang2015-03-186-0/+340
| * | Merge "Modify:Gallery2 for branch Gallery2"Linux Build Service Account2015-03-1910-9/+124
| |\|
| | * Modify:Gallery2 for branch Gallery2Zhang Zhenzhen2015-03-1810-9/+124
| * | Gallery2: Add "No faces" stringsmqi2015-03-161-1/+1
| |/
| * Merge "Gallery2: Set video view visible"Linux Build Service Account2015-03-131-2/+0
| |\
| | * Gallery2: Set video view visiblekaiyiz2015-03-121-2/+0
| * | Merge "Gallery2: set the progress bar when we pause the video"Linux Build Service Account2015-03-131-0/+1
| |\ \ | | |/ | |/|
| | * Gallery2: set the progress bar when we pause the videokaiyiz2015-03-061-0/+1
| * | Gallery2: Pause video when dialog showskaiyiz2015-03-111-0/+8
* | | Merge remote-tracking branch 'caf/LA.BR.1.2.3' into caf/cm-12.1Matt Garnes2015-03-2611-43/+52
|\| |
| * | Gallery2: Menu options list disappears very fastkaiyiz2015-03-053-2/+27
| |/
| * Gallery2: Allow edit if launched from SnapcamByunghun Jeon2015-02-241-1/+4
| * Merge 78ae61f1f21a9164052dd16f85f086f033560440 on remote branchLinux Build Service Account2015-02-224-7/+17
| |\
| * \ Merge "Gallery2 : Added support for Oma drm (CD and SD)"Linux Build Service Account2015-02-179-40/+21
| |\ \
| | * | Gallery2 : Added support for Oma drm (CD and SD)Paramananda2015-02-119-40/+21
* | | | Merge CAF branch 'LA.BR.1.2.1_rb2.19' into caf/cm-12.0.caf/cm-12.0Matt Garnes2015-03-044-7/+17
|\ \ \ \ | | |_|/ | |/| |
| * | | Gallery2: Translate image draw to Chinesekaiyiz2015-02-154-7/+17
| |/ /
* | | Merge CAF branch 'LA.BR.1.2.1_rb2.18' into caf/cm-12.0.Matt Garnes2015-02-234-12/+54
|\| |
| * | Merge "Galler2 : Load onResume on separate thread"Linux Build Service Account2015-02-132-10/+37
| |\ \
| | * | Galler2 : Load onResume on separate threadSuresh Kamasala2015-02-122-10/+37
| | |/
| * / Gallery2: request thumb if fail to get region decoderkaiyiz2015-02-111-2/+10
| |/
| * Gallery2: Notify dirty after update contentkaiyiz2015-02-041-0/+7
* | Merge CAF branch 'caf/LA.BR.1.2.1_rb2.17' into caf/cm-12.0.Matt Garnes2015-02-135-4/+40
|\|
| * Gallery2: Seek to trim start time only once when playinglubiny2015-02-011-1/+4
| * Gallery2: Fix force close issue when mute some videosxiaoqiny2015-01-302-3/+18
| * Gallery2: Set PhotoPage GL root reset when rotatekaiyiz2015-01-292-0/+18
* | Merge CAF branch 'LA.BR.1.2.1_rb2.12' into caf/cm-12.0.Matt Garnes2015-01-2935-70/+863
|\|
| * Merge "Gallery2: Edit picture during mount SD"Linux Build Service Account2015-01-221-1/+1
| |\
| | * Gallery2: Edit picture during mount SDkaiyiz2015-01-211-1/+1
| * | Merge "Gallery2: Make Gallery2 support OMADRM feature"Linux Build Service Account2015-01-2223-35/+766
| |\ \
| | * | Gallery2: Make Gallery2 support OMADRM featureParamananda Pradhan2015-01-2023-35/+766
| * | | Gallery2: Fix Gallery2 crash caused by monkey test.kaiyiz2015-01-201-2/+5
| | |/ | |/|