summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge CAF branch 'LA.BR.1.2.1_rb2.19' into caf/cm-12.0.caf/cm-12.0Matt Garnes2015-03-044-7/+17
|\ | | | | | | Change-Id: Ia3298d47deceb2f762909b71ece99b6b7c79dc27
| * Merge "Gallery2 - Add support to pass in a playlist along with video to play"bait_dispatcher_monitor_system2015-02-202-4/+43
| |\
| | * Gallery2 - Add support to pass in a playlist along with video to playRohit Yengisetty2015-02-192-4/+43
| |/ | | | | | | | | Change-Id: I9d14dc8801f82f4e343917e094b05251f49d4152 (cherry picked from commit 6df83bf3723bbee27f5a7a9deaa218e2abedf607)
| * Merge "Gallery2: Translate image draw to Chinese"bait_dispatcher_monitor_system2015-02-194-7/+17
| |\
| | * Gallery2: Translate image draw to Chinesekaiyiz2015-02-154-7/+17
| |/ | | | | | | | | | | | | | | | | The name of FilterDrawRepresentation is set 'Draw' constant. Set name of FilterDrawRepresentation from imageDraw in filter_string. Change-Id: If4ee1c4e96e52cd267c90afde1081d5b68f4d206 CRs-Fixed: 794963
* | Merge CAF branch 'LA.BR.1.2.1_rb2.18' into caf/cm-12.0.Matt Garnes2015-02-236-46/+62
|\|
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loading onResume is taking too much time So screen transition is not happening quickly. Loading onResume in separate thread with Some delay and removed animation, So screen transition can happeny smoothly. Change-Id: I0f09128f8c948a33b72a5b4933efe7f4fbba2cb2 CRs-Fixed: 785891
| * | Merge "Gallery2: Enable Suspend/Resume"Linux Build Service Account2015-02-131-33/+8
| |\ \
| | * | Gallery2: Enable Suspend/Resumemqi2015-02-121-33/+8
| | |/ | | | | | | | | | | | | | | | | | | | | | Enable "Suspend/Resume" in Gallery which was commented out while porting due to framework not ready at that time. Change-Id: I74533b676f259d01c90d81aaeff72f8e8d8fbea0 CRs-fixed: 761691
| * | Merge "Gallery2: request thumb if fail to get region decoder"Linux Build Service Account2015-02-131-2/+10
| |\ \ | | |/ | |/|
| | * Gallery2: request thumb if fail to get region decoderkaiyiz2015-02-111-2/+10
| |/ | | | | | | | | | | | | | | | | | | | | When fail to get region decoder in SinglePhotoDataAdapter,there is no change to loading state which cause the "no thumbnail" not to be displayed. When fail to get region decoder, try to request thumb image. Change-Id: Ia0a89936097bff6feb58e85c95253e5cc5549859 CRs-Fixed: 793496
| * Merge "Revert "Gallery2: Grant permission to read/write files of Settings.""Linux Build Service Account2015-02-051-1/+0
| |\
| | * Revert "Gallery2: Grant permission to read/write files of Settings."Jing Wang2015-01-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | it will be fixed by another way This reverts commit ba37d51c1ddc20b0b8472a2eee768a2d024f4fff Change-Id: I35b0ed339b427634f5056addfbefc20198dcfd04
| * | Merge "Gallery2: Notify dirty after update content"Linux Build Service Account2015-02-051-0/+7
| |\ \
| | * | Gallery2: Notify dirty after update contentkaiyiz2015-02-041-0/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The loading process end when the variable of 'mDirty' is false, and this value will set false default and set true when NotifyDirty. As a result, if the NotifyDirty called before set default value, the loading process will end before update content. Make sure there is a UpdateContent between two times of NotifyDirty. Change-Id: Ie3ed56eba6a0e354f06436fabce4fca2810e28bd CRs-Fixed: 789079
* | | Gallery2 - Add support to pass in a playlist along with video to playRohit Yengisetty2015-02-192-4/+43
| | | | | | | | | | | | | | | Change-Id: I9d14dc8801f82f4e343917e094b05251f49d4152 (cherry picked from commit 6df83bf3723bbee27f5a7a9deaa218e2abedf607)
* | | Merge CAF branch 'caf/LA.BR.1.2.1_rb2.17' into caf/cm-12.0.Matt Garnes2015-02-136-4/+41
|\| |
| * | Merge "Gallery2: Seek to trim start time only once when playing"Linux Build Service Account2015-02-021-1/+4
| |\ \
| | * | Gallery2: Seek to trim start time only once when playinglubiny2015-02-011-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When playing video in TrimVideo activity, it may enter an endless loop: Seek to trim start time (actually sought to previous sync frame) -> Periodic check, if current position < trim startm, seek again. - This patch adds a flag to ensure seeking to trim start time only once. Change-Id: I3cd74fbd85546cc35d5c32797ab7f1775f091586 CRs-Fixed: 694431
| * | Merge "Gallery2: Fix force close issue when mute some videos"Linux Build Service Account2015-01-312-3/+18
| |\ \
| | * | Gallery2: Fix force close issue when mute some videosxiaoqiny2015-01-302-3/+18
| |/ / | | | | | | | | | | | | | | | | | | - catch exception when failed to mute video Change-Id: Ib0901e9f27bdfb0b06f7a8968ca5bcffad63578d CRs-Fixed: 641477
| * | Merge "Gallery2: Set PhotoPage GL root reset when rotate"Linux Build Service Account2015-01-302-0/+18
| |\ \
| | * | Gallery2: Set PhotoPage GL root reset when rotatekaiyiz2015-01-292-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge "Gallery2: Grant permission to read/write files of Settings."Linux Build Service Account2015-01-281-0/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * Gallery2: Grant permission to read/write files of Settings.kaiyiz2015-01-281-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | Set photo of "user" via statusbar->more settings fails, because that Gallery2 does not have the permission to read and write files of Settings. Grant read and write Settings permission to Gallery2. Change-Id: Ifcc5b4d8d938960296c4fa9d0f7f302d353c3197 CRs-Fixed: 785671
* | Merge CAF branch 'LA.BR.1.2.1_rb2.12' into caf/cm-12.0.Matt Garnes2015-01-2945-78/+922
|\|
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When SD card is mounted, the data of picture can't read to get mime type. As a result, there will be NullPointerException happen for the mimeType's value is null Change position of 'mimeType' and 'JPEG_MIME_TYPE', so that the judgement can go well without NullPointerException CRs-Fixed: 783875 Change-Id: I0d48b4ade06dba1c23a76b9046163a027f38e514
| * | Merge "Gallery2: Make Gallery2 support OMADRM feature"Linux Build Service Account2015-01-2230-35/+782
| |\ \
| | * | Gallery2: Make Gallery2 support OMADRM featureParamananda Pradhan2015-01-2030-35/+782
| | | | | | | | | | | | | | | | | | | | | | | | - Make Gallery2 can recognize and consume DRM images and videos. Change-Id: I1655d295bcec31b5760c2c86c06f815cf6ed57ee
| * | | Merge "Gallery2: Fix Gallery2 crash caused by monkey test."Linux Build Service Account2015-01-211-2/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Gallery2: Fix Gallery2 crash caused by monkey test.kaiyiz2015-01-201-2/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | It is NullPointerException which cause this bug happen. Add a condition to avoid NullPointerException. CRs-Fixed: 782023 Change-Id: Ia6d64a6c2a5aa47e3b13b69a26207d9384e40930
| * | Merge "Gallery2: Pause music playback while playing video"Linux Build Service Account2015-01-201-0/+9
| |\ \ | | |/ | |/|
| | * Gallery2: Pause music playback while playing videoSurajit Podder2015-01-111-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Add changes to send pause command to music service from MoviePlayer. Change-Id: I3532ecee34f197fdca04f678cc18ae542794ae83 CRs-Fixed: 765206
| * | Merge "Gallery2: Fix color chooser"Linux Build Service Account2015-01-172-1/+13
| |\ \
| | * | Gallery2: Fix color chooserkaiyiz2015-01-142-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is another problem for this issue: the border of color is not set well for the flag of mSelectedButton. Set mSelectedButton when set up. CRs-Fixed: 764078 Change-Id: Ibaddb66abe425bdc95a1f78a58522a3b4449ae80
| * | | Merge "Gallery2: Add null pointer judgement for monkey"Linux Build Service Account2015-01-162-1/+4
| |\ \ \
| | * | | Gallery2: Add null pointer judgement for monkeykaiyiz2015-01-122-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The master image's parameters are null, as a result, there is a lot of NullPointerException during Monkey test. Add some judgement before using these parameters, return if null. CRs-Fixed: 770284 Change-Id: Ie8825f920ced2261908c19555173d36fdebca5a1
| * | | | Merge "Gallery2: Set APN setting intent's name"Linux Build Service Account2015-01-161-7/+4
| |\ \ \ \
| | * | | | Gallery2: Set APN setting intent's namekaiyiz2015-01-151-7/+4
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The APN setting activity's name is changed, so there will be no result after tap prefered APN. Start intent with ACTION_APN_SETTINGS from settings. CRs-Fixed: 777155 Change-Id: Ibb560612ad5a6748c13319ed9436ad473759e3c1
| * | | | Merge "Gallery2: Set read only image unEditable"Linux Build Service Account2015-01-161-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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 the video playback after system language changed"Linux Build Service Account2015-01-131-0/+3
| |\ \ \ | | |/ / | |/| |
| | * | Gallery2: fix the video playback after system language changedLi Sun2015-01-121-0/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - when system language changed, the activity would be destroyed and recreated. The subobject MoviePlayer would be also recreated. But in this case, MoviePlayer doesn't set some parameters like the URI, duration and etc. It cause the video playback failed. - add the related function calls to restart the video playback. Change-Id: I8dc011216bb5bcee8903ba3873ce37582927af45 CRs-Fixed: 597934
| * | Merge "Gallery2: Fix force close issue when trim video"Linux Build Service Account2015-01-122-2/+11
| |\ \ | | |/ | |/|
| | * Gallery2: Fix force close issue when trim videoxiaoqiny2014-12-254-3/+16
| | | | | | | | | | | | | | | | | | | | | - Only mp4 and 3gp file support trim function Change-Id: I6e254ca6d5445d62b0276695667f4bdb07f9a59c CRs-Fixed: 652838
| * | Merge "Gallery2: Add leave selection mode judgement"Linux Build Service Account2015-01-041-1/+1
| |\ \
| | * | Gallery2: Add leave selection mode judgementJing (Mia) Wang2015-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method of isCancelled in thread pool is a nonsynchronous method, as a result, there is a possibility that the job is not cancelled after leave selection mode, and the getSelectedMediaObjects is still running. Finish getSelectedMediaObjects when selection mode is quit. CRs-Fixed: 769028 Change-Id: Icb7c3f9d1f3e14536f32a6401337e844481ad646
| * | | Merge "Gallery2: Fix crop after straighten bug"Linux Build Service Account2015-01-041-0/+3
| |\ \ \ | | |/ / | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-12 08:22:41 +0000