summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/app
Commit message (Collapse)AuthorAgeFilesLines
* Reduce logspam in video playeremancebo2015-03-284-35/+87
| | | | Change-Id: I71b1356f7e326174378c99b4b0e5e60764a7c139
* Revert "Gallery2: The settings in the gallery is blank."Michael Bestas2015-03-281-2/+2
| | | | | | This reverts commit 21a80743d420fe04c1d24ff9e36f05224bacc8d5. Change-Id: I9417af7e6c51384f289dc1e90f6794133bac5fb7
* Gallery2: Make grids scroll vertically by defaultcretin452015-03-283-10/+28
| | | | | | - Can optionally be switched back to horizontal via overlay. Change-Id: I666a2e7cfe95cba630171b6272eda9a786be4cb6
* Gallery2: Materializationcretin452015-03-281-2/+6
| | | | | | | | | | | - Material theme - FAB - New Icon - Add missing resources for movie settings - Fix action mode - Vector drawables Change-Id: I9c8cc81759502a417a5585fd1d3fd9b61e0bd68b
* Revert "Gallery2: reduce post delay time"Surajit Podder2015-03-281-1/+1
| | | | | | | This reverts commit a062a4a3b567553622aa1e3b4de393917225b8b3. CRs-Fixed: 756218 Change-Id: I22eee7e21b0eb4a7900ae7db886b9a3cab56fe23
* Gallery2: reduce post delay timevivek mehta2015-03-281-1/+1
| | | | | | | | Currently there is 500ms of delay added in Video view that adds to app playback startup latency time. Reducing this delay to 50ms helps in reducing the startup latency. Change-Id: If1db674a66d68b94654868fd3e4d5c84ea5265e7
* 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
| | | | | | | | | | | | | | | | | | | | When security is set to none and wake up the screen,gallery lack of a broadcast to make video continue playing. Add receiver to processing video continue playing when wake up screen. Change-Id: I053f44f17178c3baa79ceea871cd66ec2683a743 CRs-Fixed: 809777
* | Gallery2: Remove wait when notify dirtykaiyiz2015-03-211-6/+0
|/ | | | | | | | | | | When notify Dirty from photo data adapter, where is a operation of waiting, but this Object.wait is locked by ReloadTask. Remove the wait when notify dirty, which notify all right away. And do the delete operation after last picture's deletion is done. Change-Id: I3c322c8d01944d1e41d784346da930b907efdb1c CRs-Fixed: 808799
* Merge "Gallery2: Set video view visible"Linux Build Service Account2015-03-131-2/+0
|\
| * Gallery2: Set video view visiblekaiyiz2015-03-121-2/+0
| | | | | | | | | | | | | | | | | | The video view is set invisible when do OnPause in movie player. Cancel the video view set in doOnPause. Change-Id: I56616ad838024bba52727122c71d3cde26546cd4 CRs-Fixed: 801784
* | 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
| | | | | | | | | | | | | | | | | | The progress bar isn't set when we pause the video. Set the progress bar when we pause the video. Change-Id: I46d2890111a7e085ffc6787fe29f2e34977ce4f2 CRs-Fixed: 801770
* | Gallery2: Pause video when dialog showskaiyiz2015-03-111-0/+8
| | | | | | | | | | | | | | | | | | | | The live stream will be pause by server timeout dialog but start by surface change callback later. Check whether the dialog shows before start media player. Change-Id: I77e8e2b6f84cb0957571d86d9eef2cfb997f1074 CRs-Fixed: 802294
* | Gallery2: Menu options list disappears very fastkaiyiz2015-03-053-2/+27
|/ | | | | | | | | | | Video playback UI in accordance with the 2.5 seconds interval automatically hide, and the Actionbar overflow menu is hidden, the UI is going to hide, the menu display time less than 2.5 seconds. When the UI is hidden, click the Actionbar overflow time after the restart the hidden. CRs-Fixed: 801773 Change-Id: I136980d246adfe0d62d452a3a5840efa1ce6e539
* Gallery2: Allow edit if launched from SnapcamByunghun Jeon2015-02-241-1/+4
| | | | Change-Id: I3d1b8f5ed9cb52012a9be5037eef8a6c5323a151
* Merge 78ae61f1f21a9164052dd16f85f086f033560440 on remote branchLinux Build Service Account2015-02-221-0/+6
|\ | | | | | | Change-Id: Ia05e5a8b4a21efb31eabb8361384af141e185f17
| * Gallery2: Translate image draw to Chinesekaiyiz2015-02-151-0/+6
| | | | | | | | | | | | | | | | | | The name of FilterDrawRepresentation is set 'Draw' constant. Set name of FilterDrawRepresentation from imageDraw in filter_string. Change-Id: If4ee1c4e96e52cd267c90afde1081d5b68f4d206 CRs-Fixed: 794963
* | Merge "Gallery2 : Added support for Oma drm (CD and SD)"Linux Build Service Account2015-02-175-27/+13
|\ \ | |/ |/|
| * Gallery2 : Added support for Oma drm (CD and SD)Paramananda2015-02-115-27/+13
| | | | | | | | Change-Id: I9c793f85e255e8fd183197410111de2dc618ca76
* | 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
* / 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
* 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: 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
* 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
* 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: Make Gallery2 support OMADRM feature"Linux Build Service Account2015-01-226-6/+489
|\
| * Gallery2: Make Gallery2 support OMADRM featureParamananda Pradhan2015-01-206-6/+489
| | | | | | | | | | | | - Make Gallery2 can recognize and consume DRM images and videos. Change-Id: I1655d295bcec31b5760c2c86c06f815cf6ed57ee
* | 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
* | 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-121-2/+10
|\ \ | |/ |/|
| * Gallery2: Fix force close issue when trim videoxiaoqiny2014-12-251-2/+10
| | | | | | | | | | | | | | - Only mp4 and 3gp file support trim function Change-Id: I6e254ca6d5445d62b0276695667f4bdb07f9a59c CRs-Fixed: 652838
* | MoviePlayer: prevent resume dialog for live streamingkaiyiz2014-12-231-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
* | Merge "Gallery2: Clear Bookmark when complete video play"Linux Build Service Account2014-12-131-0/+3
|\ \
| * | Gallery2: Clear Bookmark when complete video playmqi2014-12-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After video loaded, there will be a check for bookmark, but if the video is finish onCompletion, this bookmark will still not change Clear bookmark when onCompletion Change-Id: I0eca9b84746e08df68685c38b843281a58b10cb2 CRs-Fixed: 763193
* | | Merge "Gallery2: Fix menu display inconsistent with its cluster"Linux Build Service Account2014-12-131-7/+7
|\ \ \
| * | | Gallery2: Fix menu display inconsistent with its clusterkaiyiz2014-12-121-7/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The operation order is not correct.We should first execute the change of cluster,then display menu title according to the cluster.But we do the opposite operation,which cause the menu will always display last cluster‘s corresponding menu and cause this bug happened. Modify the operation order. CRs-fixed: 619812 Change-Id: I6cd3c82e065cef5a463e06295bf332e1459500e3
* / / Gallery2: Fix menu bar layout display error in portrait modekaiyiz2014-12-121-1/+1
|/ / | | | | | | | | | | | | | | | | | | The forward button is interlock with separate line. Modify layout param to make the layout display normal. CRs-fixed: 674514 Change-Id: Idf09aee09c67ad943109ad054fe8d4bfa41e4061
* | Merge 8d0bb42dd2cfee13a2ab639e7b8a3a86efdcb318 on remote branchLinux Build Service Account2014-12-031-0/+6
|\ \ | | | | | | | | | Change-Id: Ibbf2711e54b45de0509bd77fa94fd840e691f795
| * | Revert "Gallery2: reduce post delay time"Surajit Podder2014-11-171-1/+1
| |/ | | | | | | | | | | | | This reverts commit a062a4a3b567553622aa1e3b4de393917225b8b3. CRs-Fixed: 756218 Change-Id: I22eee7e21b0eb4a7900ae7db886b9a3cab56fe23
| * Merge "MoviePlayer: Flush UI display after suspend/resume"Linux Build Service Account2014-11-081-0/+6
| |\
| | * MoviePlayer: Flush UI display after suspend/resumeHui (QRD) Yu2014-11-051-0/+6
| | | | | | | | | | | | | | | | | | | | | - Post mPlayingCheck again in onResume() for HTTP streaming - To disable the "Loading" pattern after resume Change-Id: Ic0e5bd0bb0710d76f41a40249022526b4d4e71db
| * | Gallery2: reduce post delay timevivek mehta2014-11-051-1/+1
| |/ | | | | | | | | | | | | | | Currently there is 500ms of delay added in Video view that adds to app playback startup latency time. Reducing this delay to 50ms helps in reducing the startup latency. Change-Id: If1db674a66d68b94654868fd3e4d5c84ea5265e7
* | Merge "Gallery2: Set default value for server timeout"Linux Build Service Account2014-11-201-0/+5
|\ \
| * | Gallery2: Set default value for server timeoutkaiyiz2014-11-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timeout of server is not set when read from flag of SERVER_TIMEOUT, the value will stay to be -1, as a result there will be no resume dialog Set a default value of 3 min for resume timeout CRs-Fixed: 753834 Change-Id: Icd4640c4b56a64857dfade1bb8d7a3581494d404
* | | Gallery2: Displayed titles in ActionBar during video playbackkaiyiz2014-11-201-2/+2
|/ / | | | | | | | | | | | | | | | | | | There is no displayed titles in ActionBar during video playback Add the ActionBar Flag to displayed titles in ActionBar during video playback CRs-Fixed: 758779 Change-Id: I24da392c0dd64b8f1c520bfe75c90f38088c612a