summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Gallery2: Fix force close issue when mute some videosxiaoqiny2014-09-041-3/+12
| | | | | | | - only support mp4 and 3gp format Change-Id: I748569864565dd5580784ec8b0214f3f3e253415 CRs-Fixed: 642145
* Gallery2: avoid black screen when MovieActivity endsliangche2014-09-041-0/+1
| | | | | | | Set player status in MovieActivity when play completes, in order to avoid hiding VideoView when MovieActivity pauses. Change-Id: Ia1eedbec7a01ccac69a3355f47fd0a91d039d8b4
* Gallery2: Make forward/rewind button grey when stopVideokaiyiz2014-09-041-1/+0
| | | | | | | | | | | | StopVideo Api is setting the view visibility which causes the surface to be created and make the bug happen. Removed the functionality of the view visibility in stopVideo Api CRs-fixed: 642082 Change-Id: I4305302e52ec647bc2b935a817e77a173647be22
* MoviePlayer: add default server timeoutLikai Ding2014-09-041-0/+3
| | | | | | | | | The patch provides a default server timeout, in case of server not supplying the value or lacking low-level support, for better carrier requirements compliance. Change-Id: I4b32478823f0e0226aac3098e4ac7e7ea064a73c CRs-Fixed: 638087
* Gallery: add an activity to set system properties for streamingkaiyiz2014-09-042-4/+123
| | | | | | | | | | App forgets add an activity to set system properties for streaming. add an activity to set system properties for streaming. CRs-Fixed: 635639 Change-Id: Idba31bd7a7489a01b5cc061fffb4ebcc7af3f813
* Gallery2: Make icon display completely.kaiyiz2014-09-041-1/+1
| | | | | | | | | | The icon size is to big for the device screen. Adjust the icon size to the right width. CRs-fixed: 639562 Change-Id: Ibde082d48d4f12009f5293de049798cf221adda4
* MoviePlayer: prevent resume dialog for live streamingkaiyiz2014-09-041-3/+10
| | | | | | | | | | The player should not offer "resume playing" dialog for live streaming when user navigates back to it. (cherry picked from commit 3a16d7f019fc77c54ce38a137507ba5e5ac1ae8b) Change-Id: I7fe6727ab884056a9135d1fa5ab21125570f70a3 CRs-Fixed: 637212
* MoviePlayer: fix background issue when loading a videokaiyiz2014-09-041-1/+3
| | | | | | | | | | | | The video's width and height may be set to 0 when it's prepared, which makes the player treat it as an audio file, and set the music icon as background. Do not set the bottom panel if the player is not in playback state. (cherry picked from commit a6facd923d07a66afa71e6cefa32ec8fc95bdb7b) Change-Id: I7c2e3caf54b11b439419c22d9adb4e5eb205c706
* MoviePlayer: fix a crashLikai Ding2014-09-041-1/+1
| | | | | | Fix possible NullPointerException in setActionBarTitle(). Change-Id: Ie5fdb1c60e9db147c1a06534d2c2dbbbe64a5edb
* Gallery2: Fix gallery crash when view gif pic in Mmskaiyiz2014-09-041-1/+2
| | | | | | | | | | | | When use data uri of file from fileExplorer to view gif picture, the activity can not be found. Add type to the intent of ViewGifActivity to make the Activity can be found successfully. CRs-fixed: 636457 Change-Id: I123c3551dc394d099e03713cd415ed008b716453
* Gallery2-Add Presentation judgement in State Equelkaiyiz2014-09-041-1/+6
| | | | | | | | | | In filtershow state equel judgement, there is only one condition of Filter Class There should be another three conditions of FilterFxRepresentation, FilterImageBorderRepresentation and FilterColorBorderRepresentation CRs-fixed: 624591 Change-Id: I19f93d7bbaeb69048698c804eb50712581d87fd1
* Gallery2: Make picture in selected status when back from homepagekaiyiz2014-09-041-3/+0
| | | | | | | | | | | | When selected picture and go to homepage,the Gallery will leave selection mode, so when back to the gallery ,the picture become unselected status. Do not leave selection mode when exit the gallery page. CRs-Fixed: 630782 Change-Id: I8090c65ba39be28f9914735ee96b781068cfa3cf
* Gallery2: fix FC when try to open video folder as MMS attachment.kaiyiz2014-09-041-2/+2
| | | | | | | | | | | | | If there are too many videos in the folder, it will takes some time to check if all the items are videos, then the application may not responding. If it is get content from other apps, it do not display option menu, no need to check all items. CRs-Fixed: 581769 Change-Id: Ie59830c8756e3a2ece7fcaa526d8f09212b20d6f
* Gallery2: fix video playback after system language changeLi Sun2014-09-041-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. (cherry picked from commit 59890ad484be36860f9ad326cdcda292111e3513) Change-Id: Ie9c46ddbea2b9826988c1fa7e8e7c1c99e2606f7
* Gallery2: fix time text display issueLikai Ding2014-09-041-0/+1
| | | | | | | | | In TrimTimeBar, mTimeBounds may never get updated, which causes time text to be out of screen. Give mTimeBounds a reasonable intial value to prevent this. Change-Id: Ie0378acde5b856340ac0dccdc0a688438b7827e0 CRs-Fixed: 627787
* Gallery2: Fix the string can't be translated in Gallery2.kaiyiz2014-09-042-2/+10
| | | | | | | | | | The string is defined in FilterDrawRepresentation.java with English. Extract this string into source.xml file and get it by getString(). CR-fixed: 623893 Change-Id: Ied7afc964555cfd752af306742be69eba4a41349
* Gallery2: update content start/end once getUpdateinfokaiyiz2014-09-041-2/+6
| | | | | | | | | | | | | | When delete last picture in album , the album has changed, but this time current index and content start/end is still old value. To aviod this situation, will update content start and content end once after getUpdateinfo and then can get correct current index and item path. CRs-Fixed: 624471 Change-Id: I8eb92e685f321df2d11481f440f7d9d33cf7b820
* Gallery2: fix can not crop large *.bmp picturekaiyiz2014-09-041-0/+8
| | | | | | | | | | | | | | | | It returns an equivalent scaled cropBounds as true crop bounds, then it set the rounded rect by rounding "out" the true crop rect, this make the rounded crop rect may out range of the original bitmap, then an error will happen. We change to check the rounded crop rect, if it is out the range of original bitmap, we set the original bitmap bounds as rounded crop bounds. CRs-Fixed: 621889 Change-Id: Ifb63754255b618fe65a4064663dfb4962bfdf8b8
* Gallery2: Can set picture as screen color background.kaiyiz2014-09-041-7/+8
| | | | | | | | | | | | | | The upgrade of android4.4 make the set wallPaper activity be executed when set picture as background color. Add a condition to judge fromScreenColor and when judge the fromScreenColor is set as true, then execute the activity of set picture as color background activity instead of set wallpaper activity. CRs-Fixed: 623268 Change-Id: Id4dfa745f9d8379af084b8e2752f775ad85c9c52
* Gallery2: Fix crash sometimes when delete video in Gallery.kaiyiz2014-09-041-1/+6
| | | | | | | | | | | | | It's the IndexOutOfBoundsException which causes the app crash. According to log, it's the size of list is 0, but still want to get the first item in list. Add extra judgement before get item from ArrayList, if the size is 0, skip it as the item is null. CRs-Fixed: 622574 Change-Id: Ide839b2a73954b9da052a6fece46c864dfa42a21
* Gallery2: Fix Gallery Crash when click Information menu.kaiyiz2014-09-041-3/+5
| | | | | | | | | | | | | | In UpdatePreviewTask,the condition in the doInBackground is not correct which cause the NullPointerException happened. Only judge the buffer.getProducer() before it is used. CRs-Fixed: 619081 Conflicts: src/com/android/gallery3d/filtershow/pipeline/UpdatePreviewTask.java Change-Id: Iac3152328abeb72002785cfa2eb28830ea87f439
* MoviePlayer: prevent black screen on resumingLikai Ding2014-09-041-2/+7
| | | | | | | | | If a user leaves streaming video and then returns to it, a black screen is shown because of buffering. Show a spinner to prevent this. CRs-Fixed: 613579 Change-Id: Iceb658b3280aacfce3c82b9268b922a8d4d69333
* MoviePlayer: fix streaming video stepping forwardLikai Ding2014-09-042-34/+19
| | | | | | | | | | The default forward/rewind step is 3/6 seconds, which falls short to reach another intra-frame. Change the default to 10 seconds. Also, some code clean-up is made. CRs-Fixed: 613577 Change-Id: I94bceb5cdac0904545ef58609855c8fb8d6aa05a
* Gallery2: Fix the video play time not change.kaiyiz2014-09-041-0/+1
| | | | | | | | | | | When server timeout,streaming onResume forget post mProgressChecker. Add handler post mProgressChecker. CRs-Fixed: 588086 Change-Id: I33949855dd317dd01c507fe3e696d69714df4c74
* Gallery2: Fix batches of issues in movie effectswjiang2014-09-043-40/+61
| | | | | | | | | | | | | | | | Fix following issues: - All settings aren't restored to previous state when user cancel his operations. - Check the validity to avoid calling member function of an already released object. - Recycle effect instance when MovieActivity pauses. - Don't restore strength from pref when toggling switch. - Force the Effect's dialog to be uncancelable. - Fix null pointer and effect leak issue due to CMCC features. - Fix audio effects dialog display on small screens - Recognize bluetooth headset. Change-Id: I803897508c0c1a6723170b7691e3ece03680e4f1
* MoviePlayer: Flush UI display after suspend/resumeHui (QRD) Yu2014-09-041-0/+6
| | | | | | | - Post mPlayingCheck again in onResume() for HTTP streaming - To disable the "Loading" pattern after resume Change-Id: Ic0e5bd0bb0710d76f41a40249022526b4d4e71db
* Gallery2: add some video featuresLikai Ding2014-09-0424-402/+1817
| | | | | | | including: previous/next video play mode, screen mode, fast forward/rewind button, step settings. Change-Id: I3f4890c4dd95956e0eca889a5fd8b8d83b8d542e
* Gallery2: add some video featuresLikai Ding2014-09-0411-0/+992
| | | | | | | (cherry picked files from commit id 990c6d43ea7c184846e19d41bef0d93aee4e581b) Change-Id: Ifdcc4e9ab14d1f8b273faa97f0f66ba2f4034bea
* Gallery2: support live streaming and bookmarksLikai Ding2014-09-0416-1377/+2456
| | | | | | | Users can input a URL for streaming display. URL bookmarking is supported. Change-Id: Ia69497cdcfee963ba2209119a5b9dc82b64497da
* Gallery2: support live streaming and bookmarksLikai Ding2014-09-048-0/+1807
| | | | | | | (cherry picked new files from commit id 990c6d43ea7c184846e19d41bef0d93aee4e581b) Change-Id: Idc254cf0f7e8a9b492203313fa63349d07d19d5c
* Gallery2: support stereo/single track play modeLikai Ding2014-09-046-26/+145
| | | | | | User can select stereo/single track play mode. Change-Id: I8225739815484f3c288823802f68478cb457725e
* Gallery2: support stereo/single track play modeLikai Ding2014-09-041-0/+118
| | | | | | | (cherry picked new files from commit id 990c6d43ea7c184846e19d41bef0d93aee4e581b) Change-Id: I2d7d523ca586a031c3fb139eda321d5073b30589
* Gallery2: support loop/single video play modeLikai Ding2014-09-0415-423/+421
| | | | | | | | This change allows a video to be played repeatedly. It also introduces an extension framework. Change-Id: I5566192f138c1f0fd889b85496dd27fbf2aed10d CRs-Fixed: 507973
* Gallery2: support loop/single video play modeLikai Ding2014-09-0410-0/+836
| | | | | | | (cherry picked new files from commit id 990c6d43ea7c184846e19d41bef0d93aee4e581b) Change-Id: I0f55dfdfe812262804e7e45c99c7c9bbc5fb7503
* Gallery2: support audio effects during video play.Likai Ding2014-09-043-0/+575
| | | | | | | | CRs-Fixed: 516108 CRs-Fixed: 516113 CRs-Fixed: 516114 Change-Id: I267c3c7e402fd5cf2bb223547003af491dd8289e
* Gallery2: Support HSCI screencolor settings useZhang Fang2014-09-041-6/+29
| | | | | | Let it can change HSCI when the picture selected from Gallery2 in screencolor settings. Change-Id: I57cdb7080820defaa27a2f2e93e479374f00b09a
* Gallery2: support GIF animationLikai Ding2014-09-0410-1134/+1057
| | | | | | | This change implements a Java GIF decoder. Change-Id: I72b6e8eb25572bba77a2a46e1754d8db8c47a0cc CRs-Fixed: 517575
* Gallery2: support GIF animationLikai Ding2014-09-045-0/+1127
| | | | | | | (cherry picked new files from commit 2b133c9747af26701a12d60caef3e7e14cf55536) Change-Id: I227cef76cbacd66b7e87bc59b4f07d518b70a859
* Gallery2: fix two same albums come out after double click tagskaiyiz2014-09-041-1/+37
| | | | | | | | | | | | | | | | | When user click group by tags in albumpage,it will start albumsetpage to make gallery display the pictures which are sorted by tags.Then albumpsetpage will new a thread to load albums data.So two threads will be created if user click group by tags twice quickly.So the data will be handled by two thread.So the size of the albums will be add twice. So two same albums came out. For thread security,we add a synchronized to make sure the mAlbums can be only handled by one thread. CRs-Fixed: 562742 Change-Id: Ib1e2356fe25811c6d5d083cedd1861ce3bf7dea3
* Gallery2: Fix NPE in LocalSource during monkey test.kaiyiz2014-09-041-2/+6
| | | | | | | | | | | The object which is obtained by accquire MediaProvider client is null when MediaStorage is killed or disabled by monkey test or others. Add null check in LocalSource.java::pause(). CRs-Fixed: 540075 Change-Id: Icba85e77e86793e344e55255c27b195c11186fc8
* Gallery2: Fix force close when deletes about 5000 pictures.kaiyiz2014-09-041-1/+1
| | | | | | | | | | | | | | According to the log analysis, it's the NullPointerException and ArrayIndexOutOfBoundsException which will cause application crashes. The root cause is multiple thread will call the method getMediaItem in LocalMergeAlbum. To avoid multiple thread mess, add lock to keep safe. CRs-Fixed: 545575 Change-Id: Iaadbb638cfb3f15193f5fcb7d4027ddd5f881201
* Gallery2: fix display abnormal when tap sharpness in filtershowkaiyiz2014-09-041-9/+9
| | | | | | | | | | | | | | In Android4.3 version, it using stride to pad row layouts in script, and can't do 1D indexing of 2D objects, this make the resulting pixel values are not the corresponding coordinates' pixel value. We change to use rsGetElementAt() not gPixels() to get the correct pixel values. CRs-Fixed: 539928 Change-Id: Ifc0e516014c9fd974f3e7df163b06f732499f7c0
* Gallery2: fix selection count didn't update after floder is deletedkaiyiz2014-09-041-0/+3
| | | | | | | | | | If we select an album and then delete it in file explorer, the Gallery2 can not update the selection count, we change to leave selection mode when albumsetpage is paused. CRs-Fixed: 529042 Change-Id: Ic972ea23a64e0779e18ca9397b4619fb90ce3ecf
* Gallery2: fix can not add gallery widget to home screenkaiyiz2014-09-041-1/+1
| | | | | | | | | | | | | When selected to add a cropped picture to home screen, the binder transaction failed because it was too large, add widget failed. We reduce the allowed maximum bitmap size in intent, to make sure that binder size will not greater than 1M. CRs-Fixed: 528927 Change-Id: Id63c8503dead66ab18531a78b0b4206d1fd30d07
* Gallery2: fix cropview shows abnormal if lock and rotate screenkaiyiz2014-09-041-0/+6
| | | | | | | | | | | | | | The canvas value will effect the screenbounds value. When screen is locked, the screen orientation will be force changed to portrait but the screenbounds will still use landscape value. To fix this issue, if found screenbounds changed, we will make dirty true to update the view. CRs-Fixed: 557210 Change-Id: Ia84581d122da76f084117dfd0a195ce2784e18c9
* Gallery2: Remove slideshow option if all files of the folder are videoyanglv2014-09-041-0/+31
| | | | | | | | | | | | Enter Gallery and open folder whose files are all video, press menu key should no slideshow option. Add condition to remove slideshow if the folder are all video files. CRs-Fixed: 574984 Change-Id: Ib1603f1609b6490e44039ab64abefb44f14bd477
* Gallery2: Fix the superposition of two images issuekaiyiz2014-09-041-0/+2
| | | | | | | | | | | | | | | | When we zoom out to film mode from single photo mode with more than two fingers, PhotoView will receive multi onScaleBegin/onScaleEnd streams. But when mModeChanged is true, it will only notify PositionController to beginScale but not to endScale, then mInScale remains in true state. So when we back to single photo mode from film mode, focuse photo can't do scale animation in Box.startSnapback(). According to the logic in onScaleEnd(), we will ignore other scale begin notification if film mode has been changed. CRs-Fixed: 551984 Change-Id: I468d932adab0a3540f107501db4d0ea4b7ffbb10
* Gallery2: The menu bar will not flicker.kaiyiz2014-09-042-2/+12
| | | | | | | | | | | | | When select/unselect items,the operation of menu bar is set visible or invisible repeatly which cause the menu bar flicker. Add a condition to judge whether the menu bar should invisible at the beginning. And make the Share operation invisible only when the num of selection picture is over 300. CRs-Fixed: 567580 Change-Id: I58c724f7426a33f8b94bac174fc4d512a7aa6c49
* Gallery2: catch OOM error when crop big-size picturekaiyiz2014-09-041-3/+9
| | | | | | | | | | | An OOM error happened when set big size of picture as wallpaper We catch the OOM error, and if fail to crop the picture, we show a toast. CRs-Fixed: 522476 Change-Id: Ia9d7f41ca768c9183b26051fb08c9f823fec0074
* Gallery2: if selected count is 0, leave selection mode.kaiyiz2014-09-041-0/+2
| | | | | | | | | | | | If the selected count is 0, no need stay in selection mode. After we toggle a item, if selected count is 0,leave the selection mode. CRs-Fixed: 412492 Change-Id: Ia3ecd1c77f4074f21b1f906050b4a7bc2dc37c6e