summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Modify:Gallery2 for branch Gallery2"Linux Build Service Account2015-03-1910-9/+124
|\
| * Modify:Gallery2 for branch Gallery2Zhang Zhenzhen2015-03-1810-9/+124
| | | | | | | | | | | | | | Conflicts: res/values-zh-rCN/strings.xml res/values/strings.xml Change-Id: I6b760469290ca154f223f94a3c284fca7a513121
* | Gallery2: Add "No faces" stringsmqi2015-03-161-1/+1
|/ | | | | | | | | | Gallery shows "Untagged" when grouping pictures by faces if no faces were tagged. Change "Untagged" to "No faces". Change-Id: I7cde7a26e7340bdd95706d34480d8e8f61683138 CRs-Fixed: 807429
* 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-224-7/+17
|\ | | | | | | Change-Id: Ia05e5a8b4a21efb31eabb8361384af141e185f17
| * 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 "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
| | | | | | | | 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: 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-2223-35/+766
|\ \
| * | Gallery2: Make Gallery2 support OMADRM featureParamananda Pradhan2015-01-2023-35/+766
| | | | | | | | | | | | | | | | | | - Make Gallery2 can recognize and consume DRM images and videos. Change-Id: I1655d295bcec31b5760c2c86c06f815cf6ed57ee
* | | 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
* | | | 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
* | 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
* | | Gallery2: Fix crop after straighten bugkaiyiz2015-01-031-0/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | During straighten and crop, there will be a crop Rect exits, the comparement of these two Rect is not perfect, so the two rect is considered to be different, and the Representation is wrong. Set the origenal Rect equals to representation. CRs-Fixed: 766877 Change-Id: Id76dfef360cdaff109cdce505cb5f289691645c6
* | 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: Fix monkey test fail"Linux Build Service Account2014-12-173-3/+15
|\ \
| * | Gallery2: Fix monkey test failkaiyiz2014-12-033-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When click undo in filtershowActivity,the position can't be -1 In FilterShowActivity,the preset and Rect shouldn't be null. Add some check for position and null pointer check for preset and rect CRs-fixed: 693810 Change-Id: I70fa2ff86d40ad483474b60ab9071ccb151bd445
* | | 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
* | | | Merge "Gallery2: Fix menu bar layout display error in portrait mode"Linux Build Service Account2014-12-131-1/+1
|\ \ \ \
| * | | | 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
* / / / Gallery2: Fix cropped picture cannot be saved.kayiz2014-12-121-12/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When click the saveButton to save the cropped picture, We found the source picture uri and the cropped picture uri are the same,which cause the cropped picture can not be saved. Closed file Stream of mInStream before re-open it for the same file. CRs-Fixed: 622666 Change-Id: Ifcaa39ea76c141021259fad891411c59f7587903
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 01:26:28 +0000