summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Modify:Gallery2 for branch Gallery2Zhang Zhenzhen2015-03-1826-10/+716
| | | | | | | Conflicts: res/values-zh-rCN/strings.xml res/values/strings.xml Change-Id: I6b760469290ca154f223f94a3c284fca7a513121
* Merge "Gallery2: Gallery2 resources for beautification feature"Linux Build Service Account2015-03-1616-0/+0
|\
| * Gallery2: Gallery2 resources for beautification featureByunghun Jeon2015-03-1216-0/+0
| | | | | | | | Change-Id: I2da57ec1bf807d89494abd84b5bb7a7f3a9f5e51
* | Merge "Merge 8f7f1987e30cac3e6918adefa2980c949f26ce30 on remote branch"Linux Build Service Account2015-03-160-0/+0
|\ \
| * | Merge 8f7f1987e30cac3e6918adefa2980c949f26ce30 on remote branchLinux Build Service Account2015-03-150-0/+0
|/| | | | | | | | | | | Change-Id: I89562db0672e46e36392528edf5f18cbb66ee6fc
| * | Merge "Gallery2: Pause video when dialog shows"Linux Build Service Account2015-03-092-0/+14
| |\ \
| | * | Gallery2: Pause video when dialog showskaiyiz2015-03-062-0/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge "Gallery2 : Added support for Oma drm (CD and SD)"Linux Build Service Account2015-03-039-40/+21
| |\ \
* | \ \ 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
* | | | Merge "Gallery2: Pause video when dialog shows"Linux Build Service Account2015-03-112-0/+14
|\ \ \ \
| * | | | Gallery2: Pause video when dialog showskaiyiz2015-03-112-0/+14
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge commit into AOSP_MERGENatiq Ahmed2015-03-105-11/+11
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: I8bb85ff15acbfc70701d259f1761715a2041aa74
| * \ \ \ am 62691568: (-s ours) am 5fe0d63f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '62691568539d22ccdb0b558e362d2beda8b43b29': Import translations. DO NOT MERGE
| | * \ \ \ am 5fe0d63f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-190-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5fe0d63fe8c2a0317b7d1266394748275648bb33': Import translations. DO NOT MERGE
| * | | | | | am ed459a8f: (-s ours) am 5d95f0c5: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ed459a8f55ba1b09c728d324802cc9816e729687': Import translations. DO NOT MERGE
| | * | | | | am 5d95f0c5: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-300-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d95f0c58425544aa20542b8737fa159cce66b56': Import translations. DO NOT MERGE
| * | | | | | | am 0f5af786: am 014369d5: Bring Gallery2 manifest into parity with CROP supportAlan Newberger2014-09-181-3/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f5af786a2aee8a1e6dd8cfad1ec7b51983481d1': Bring Gallery2 manifest into parity with CROP support
| | * | | | | | am 014369d5: Bring Gallery2 manifest into parity with CROP supportAlan Newberger2014-09-181-3/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '014369d5abdcd23e951d31021144d2e0039cd218': Bring Gallery2 manifest into parity with CROP support
| * | | | | | | | am fbbc8f1e: (-s ours) am 58305fc4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fbbc8f1ed23890056b4841a54f0a95b593f0a3df': Import translations. DO NOT MERGE
| | * | | | | | | am 58305fc4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-160-0/+0
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '58305fc4246cd82429b8882a4aca22c21fdc89d4': Import translations. DO NOT MERGE
* | | | | | | | | Merge "Gallery2: Menu options list disappears very fast"Linux Build Service Account2015-03-053-2/+27
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | 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
* | | | | | | | Merge "Gallery2: Allow edit if launched from Snapcam"Linux Build Service Account2015-02-251-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Gallery2: Allow edit if launched from SnapcamByunghun Jeon2015-02-241-1/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d1b8f5ed9cb52012a9be5037eef8a6c5323a151
* | | | | | | | Merge "Merge 78ae61f1f21a9164052dd16f85f086f033560440 on remote branch"Linux Build Service Account2015-02-236-11/+60
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge 78ae61f1f21a9164052dd16f85f086f033560440 on remote branchLinux Build Service Account2015-02-226-11/+60
|/| | | | | | | | | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | Change-Id: Ia05e5a8b4a21efb31eabb8361384af141e185f17
| * | | | | | | 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 "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 "Merge 12cf0d082018c504db4839b8b162e1d17960c3ff on remote branch"Linux Build Service Account2015-02-164-45/+55
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge 12cf0d082018c504db4839b8b162e1d17960c3ff on remote branchLinux Build Service Account2015-02-154-45/+55
|/| | | | | | | | |/ / / / / / | | | | | | | | | | | | | | Change-Id: I1a3f976e0013fa30eacca6c224c32a8d419e742e
| * | | | | | 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
* | | | | | | 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
|\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 00:13:25 +0000