summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'caf/LA.BR.1.2.3' into caf/cm-12.1caf/cm-12.1Matt Garnes2015-05-0582-750/+1183
|\ | | | | | | | | | | | | Conflicts: res/layout/action_mode.xml Change-Id: Id4005a098134f089e904ed090acec7ca6f786ad1
| * Merge "Gallery2 : Video share option is not working"Linux Build Service Account2015-04-161-3/+5
| |\
| | * Gallery2 : Video share option is not workingParamananda2015-04-161-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | - Issue is due to OMA DRM integration on the platform. - Added video share option on local video supported operation list. CRs-Fixed: 822784 Change-Id: Ia2a81b5f08ac02b98dd365b788d766ae3b57020e
| * | Merge "Gallery2 : Delete and Details options are not visible on Camera preview"Linux Build Service Account2015-04-142-4/+4
| |\|
| | * Gallery2 : Delete and Details options are not visible on Camera previewParamananda2015-04-132-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Added SUPPORT_DELETE and SUPPRT_INFO option on option item of image preview screen. CRs-Fixed: 819964 Change-Id: If8bbc702073d7193afb445feaa08d766886d3f22
| * | Merge "Gallery2 : Drm file can be set as wallpaper"Linux Build Service Account2015-04-081-0/+4
| |\ \
| | * | Gallery2 : Drm file can be set as wallpaperParamananda2015-04-061-0/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only DRM FL file can be set as device wallpaper. Other licenseable files like CD and SD can not be allow for wallpaper because after license expaired we can not revert wallpaper to default. CRs-Fixed: 804190 Change-Id: I42f501b6a06a057765f80a6a124970bec6619e85
| * | Merge "Gallery2: Gallery2 can't show the newest picture"Linux Build Service Account2015-04-071-0/+10
| |\ \ | | |/ | |/|
| | * Gallery2: Gallery2 can't show the newest picturewangjing2015-04-031-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera give Gallery2 the newest picture's index is wrong in RTL mode. Give the newest picture's index in RTL mode. Change-Id: I6c23da7699f177b901b15abe859ce07ebb409c16 CRs-Fixed: 816284
| * | Merge "Gallery2 : Drm lock icon added on Photo widget for drm content"Linux Build Service Account2015-04-054-4/+83
| |\ \
| | * | Gallery2 : Drm lock icon added on Photo widget for drm contentParamananda2015-04-024-4/+83
| | | | | | | | | | | | | | | | | | | | | | | | CRs-fixed : 804180 Change-Id: I11c969f0156dba6db75c924a568eaa0733395208
| * | | Merge "Gallery2 : GIF animated drm file can be visible in Gallery app"Linux Build Service Account2015-04-051-0/+20
| |\| |
| | * | Gallery2 : GIF animated drm file can be visible in Gallery appParamananda2015-04-021-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | CRs-fixed : 804192 Change-Id: I0d62ebc31b54d5369e9530089e7c47088fc8d92f
| * | | Merge "Gallery2 : Uses internal Drm image decoder api in Gallery app"Linux Build Service Account2015-04-0527-702/+274
| |\| | | | |/ | |/|
| | * Gallery2 : Uses internal Drm image decoder api in Gallery appParamananda2015-04-0227-702/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove all previous drm implementation which is basically uses base bitmap decode apis to decode drm image files. - Introduced new hidden apis on BitmapFactory and BitmapRegionDecoder specific to DRM content which is more practical to DRM framework. - Uses DrmHelper a utility drm api library to code reusability. - This approch will fix the issue on sharing images from Third party application. CRs-fixed : 804191 Change-Id: I2e9489800c57df4fdeeb21f1548fbccc6dfbd3f9
| * | Merge "Gallery2: The spinner icon display different on Gallery home page and ↵Linux Build Service Account2015-04-021-1/+1
| |\ \ | | |/ | |/| | | | other page in RTL mode."
| | * Gallery2: The spinner icon display different on Gallery homekaiyiz2015-04-011-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | page and other page in RTL mode. The Spinner use RTL layout,which leads to the interface button direction is inconsisten. Cancel the spinner RTL layout patterns, modified into regular pattern. Change-Id: If400f06028604675596f4dd6c15e1491595c0cdf CRs-Fixed: 816286
| * Merge "Gallery2: Modify the action of rewind and forward button" into ↵Linux Build Service Account2015-03-301-2/+14
| |\ | | | | | | | | | LA.BR.1.2.3
| | * Gallery2: Modify the action of rewind and forward buttonkaiyiz2015-03-231-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | When change to arabic language, the rewind and forward button should exchange their behavior due to the direction of progress bar is changed. Change default behavior of the media button for RTL. Change-Id: I5254fbf8329d74344e7c2f159c55473169c5c2ae
| * | 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
| * | | Merge "Gallery2: Remove wait when notify dirty"Linux Build Service Account2015-03-232-6/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Gallery2: Remove wait when notify dirtykaiyiz2015-03-212-6/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Don't bundle beautification libraries"Linux Build Service Account2015-03-221-1/+0
| |\ \
| | * | Gallery2: Don't bundle beautification librariesJay Wang2015-03-221-1/+0
| |/ / | | | | | | | | | | | | | | | | | | Remove beautification libararies from LOCAL_JNI_SHARED_LIBRARIES as they are not planned to be bundled with Gallery2 apk Change-Id: I7508d775644a480ce5248cddf02b3a853b200cfb
| * | Merge "Gallery2: Remove the 'Make available offline'"Linux Build Service Account2015-03-211-0/+1
| |\ \ | | |/ | |/|
| | * Gallery2: Remove the 'Make available offline'kaiyiz2015-03-201-0/+1
| |/ | | | | | | | | | | | | | | | | The 'Make available offline' is not availiable Remove this item in menu Change-Id: Ia4e79b48b321c09ffefa30c7d12ee6bbec9094bd CRs-Fixed: 810360
| * Merge "Gallery2: Move files to the correct location"Linux Build Service Account2015-03-1910-6/+0
| |\
| | * Gallery2: Move files to the correct locationJay Wang2015-03-1810-6/+0
| | | | | | | | | | | | Change-Id: Ife7f7a2fa656cba06e2f713b27dcdadc720a021d
| * | Merge "Modify:Gallery2 for branch Gallery2"Linux Build Service Account2015-03-1926-10/+716
| |\|
| | * 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: Add "No faces" strings"Linux Build Service Account2015-03-185-1/+8
| |\ \ | | |/ | |/|
| | * Gallery2: Add "No faces" stringsmqi2015-03-165-1/+8
| |/ | | | | | | | | | | | | | | | | | | 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: 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 remote-tracking branch 'caf/LA.BR.1.2.3' into caf/cm-12.1Matt Garnes2015-03-2616-54/+63
|\| | | |
| * | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-12 08:23:03 +0000