summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-108-23/+23
|\ | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Gallery2 into cm-13.0 Android 6.0.1 release 22
| * am c46e6eaa: (-s ours) am 12c2e1d4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| |\ | | | | | | | | | | | | * commit 'c46e6eaa9c5880afc46d7ce3f259be192fe29c98': Import translations. DO NOT MERGE
| | * am 12c2e1d4: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| | |\ | | | | | | | | | | | | | | | | * commit '12c2e1d4f58a0ddb252fd6f6447da46e10c963ef': Import translations. DO NOT MERGE
| * | | am e24fee17: (-s ours) am e00fd06f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'e24fee17ac4b65854413d3b720c44e329433c33c': Import translations. DO NOT MERGE
| | * | am e00fd06f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'e00fd06fdedaadbac2d4f9dd71831d9c24e3fbed': Import translations. DO NOT MERGE
| * | | | am 8afff945: am e71248e4: am 1bfb4e42: Create RenderScript ScriptC without ↵Miao Wang2015-07-296-8/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resourceID. * commit '8afff945027a4aad74077af96bd001326f04e569': Create RenderScript ScriptC without resourceID.
| | * | | am e71248e4: am 1bfb4e42: Create RenderScript ScriptC without resourceID.Miao Wang2015-07-296-8/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e71248e4da5f3109e3296574981460ab04cd8339': Create RenderScript ScriptC without resourceID.
| * | | | | am c683cef2: (-s ours) am a2aab1aa: (-s ours) am d9662ac6: (-s ours) Import ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'c683cef233646d21e21e49df095836a4986005dd': Import translations. DO NOT MERGE
| | * | | | am a2aab1aa: (-s ours) am d9662ac6: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a2aab1aa459c2f16016e0bc2bd4e93aee2d39c27': Import translations. DO NOT MERGE
| * | | | | | am 650418e5: (-s ours) am f288f992: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '650418e5a76e96bb03b5839a8a4ec36dd2106131': Import translations. DO NOT MERGE
| | * | | | | am f288f992: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f288f992f8920f2f159bd60fb3d32d58cfcfd064': Import translations. DO NOT MERGE
| * | | | | | | am eb6babec: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb6babec2015ee741a01aa2890356f834d497ca5': Import translations. DO NOT MERGE
| * | | | | | | am a6adf133: Fix RenderScript warnings.Jean-Luc Brouillet2015-05-282-5/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a6adf1339543812fef50fd32ea4a1592c1cc55e0': Fix RenderScript warnings.
| * \ \ \ \ \ \ \ am 0addfeb2: Gallery2 app might use cleartext network traffic.Alex Klyubin2015-05-201-1/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0addfeb2d1851fe6d6ddd80b66882f00f1c2d927': Gallery2 app might use cleartext network traffic.
| * \ \ \ \ \ \ \ \ am 99edf29a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-140-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '99edf29ae47ca63d197cd7974c7eef7e067e96d4': Import translations. DO NOT MERGE
* | | | | | | | | | | Automatic translation importMichael Bestas2016-03-05212-7/+11079
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia31bc41ca69bbcefab2aa2bed94de6655db69b52
* | | | | | | | | | | Automatic translation importMichael Bestas2016-02-226-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6cb640f069719819e1fbc8c34102a944f46a1a6a
* | | | | | | | | | | Automatic translation importMichael Bestas2016-02-144-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I880b0ac9ce77945f0fda7a18c08869aeb846b068
* | | | | | | | | | | Automatic translation importMichael Bestas2016-02-026-1/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ca19c3291dd04e1f03e18adbab80be6a81efa96
* | | | | | | | | | | Automatic translation importMichael Bestas2016-01-253-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I972195bfd3ff82de299fcca7e98d83a649a047c2
* | | | | | | | | | | Automatic translation importMichael Bestas2016-01-1111-3/+341
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib468546b7470cbe8225d48e530dd8490f713e450
* | | | | | | | | | | Automatic translation importMichael Bestas2015-12-2521-301/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If525798946550124b6cf1bfe33c0257aa2501640
* | | | | | | | | | | Revert "Gallery2: Properly declare the own permissions"Michael Bestas2015-12-191-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Breaks Google+ installation because of duplicate permissions This reverts commit cf90a15bee6eb0ebe04d991c2bcd66f98d69daac. Change-Id: I1c5797475cb1c71bb9a7d80b0d0216090c3b89fb
* | | | | | | | | | | Gallery2: Properly declare the own permissionsAdrianDC2015-11-191-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0613752feb8641eb87ed211d52556316f379f72c Signed-off-by: AdrianDC <radian.dc@gmail.com>
* | | | | | | | | | | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-053-7/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-241-5/+5
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib110db98277e4edbeba218a533589913392741b5 Auto-generated-cl: translation import
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-183-3/+3
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I68cbf3e741c7821bb92337a6dd17a16947904b51 Auto-generated-cl: translation import
| * | | | | | | | am 1bfb4e42: Create RenderScript ScriptC without resourceID.Miao Wang2015-07-296-8/+5
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '1bfb4e42a0dd97a78cd13d35f0c2b7add600357c': Create RenderScript ScriptC without resourceID.
| * | | | | | | | am d9662ac6: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd9662ac615b0d5ac1edcbaab6ddd202edc743195': Import translations. DO NOT MERGE
| * | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-113-8/+8
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaadd27db526c2ad464cffb9537c09e0771a87c07 Auto-generated-cl: translation import
* | | | | | | | Revert "Gallery2: Enable Suspend/Resume"Steve Kondik2015-10-181-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9b1ab3613c9e22f45c7404d5a5acd6b24df4dce6. Change-Id: Ic023655b4dd47be35cf5efa43557af1c60cb1420
* | | | | | | | Gallery2: Revert DRM featureSteve Kondik2015-10-1828-428/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Missing framework support in M, revisit later. Revert "Gallery2 : Drm file can be set as wallpaper" This reverts commit b00985f4de70444fa5ece9e8a78a79e73f4475b1. Revert "Gallery2 : Drm lock icon added on Photo widget for drm content" This reverts commit 4f3e49619d3954056f899660cc764f3773d92141. Revert "Gallery2 : GIF animated drm file can be visible in Gallery app" This reverts commit f5b491b181839286f58d640ae690f1860ef19e8c. Revert "Gallery2 : Delete and Details options are not visible on Camera preview" This reverts commit 704bff736bda2bc5f6c5aa2956879f55101191f5. Revert "Gallery2 : Video share option is not working" This reverts commit ea87a93df185b9f8c1e477188b55a2fe97dc983e. Revert "Gallery2 : Uses internal Drm image decoder api in Gallery app" This reverts commit 01f5f347cf33813b51bd0865dc620d001c8d8735. Revert "Gallery2 : Added support for Oma drm (CD and SD)" This reverts commit 43044da1965c1b687695f3f4e1d44d3636496978. Revert "Gallery2: Make Gallery2 support OMADRM feature" This reverts commit 829f9ad8c06070038cdef24e5fac76a8a16f841b. Change-Id: I4300285fd8539eb2e3134a0e472a087b83a0228f
* | | | | | | | Merge branch 'cm-12.1' of ↵Steve Kondik2015-10-17465-839/+20209
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/CyanogenMod/android_packages_apps_Gallery2 into cm-13.0 Change-Id: Ib8caa024d2e6feca332e3645038f226fd5a910a2
| * | | | | | | | Automatic translation importMichael Bestas2015-10-126-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3278b996c80f61608166a71098b2d10050a51212
| * | | | | | | | Automatic translation importMichael Bestas2015-10-034-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id0aa02efbe3dab3019fb0310397f886317a89e1c
| * | | | | | | | Automatic translation importMichael Bestas2015-09-2418-7/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie7f0f15941fbb0e43fdccea047248fb82830862d
| * | | | | | | | Move & improve CAF stringsMichael Bestas2015-09-203-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also remove unused ones Change-Id: I33fdb6845b0a79c7eb6994c4ac658d4dd73d708f
| * | | | | | | | Gallery2 : Delete and Details options are not visible on Camera previewParamananda2015-09-182-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added SUPPORT_DELETE and SUPPRT_INFO option on option item of image preview screen. CRs-Fixed: 819964 Change-Id: If8bbc702073d7193afb445feaa08d766886d3f22
| * | | | | | | | Gallery2 : Video share option is not workingParamananda2015-09-181-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
| * | | | | | | | Gallery2 : Drm file can be set as wallpaperParamananda2015-09-151-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
| * | | | | | | | Gallery2 : Drm lock icon added on Photo widget for drm contentParamananda2015-09-154-4/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRs-fixed : 804180 Change-Id: I11c969f0156dba6db75c924a568eaa0733395208
| * | | | | | | | Gallery2 : GIF animated drm file can be visible in Gallery appParamananda2015-09-151-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRs-fixed : 804192 Change-Id: I0d62ebc31b54d5369e9530089e7c47088fc8d92f
| * | | | | | | | Gallery2 : Uses internal Drm image decoder api in Gallery appParamananda2015-09-1527-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
| * | | | | | | | Gallery2 : Added support for Oma drm (CD and SD)Paramananda2015-09-159-40/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9c793f85e255e8fd183197410111de2dc618ca76
| * | | | | | | | Gallery2: Make Gallery2 support OMADRM featureParamananda Pradhan2015-09-1530-35/+782
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make Gallery2 can recognize and consume DRM images and videos. Change-Id: I1655d295bcec31b5760c2c86c06f815cf6ed57ee
| * | | | | | | | Gallery3d : Fix CROP_ACTION for third party appsDanesh M2015-09-145-36/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain apps such as google photos, don't respect return-data true, since the bitmap could be very large. Switch to a file provider to pass the external apps a uri to write cropped results to. Change-Id: I9ec8b8defaffa3d9fa0c2cdfd68422eeff5aef84
| * | | | | | | | Automatic translation importMichael Bestas2015-09-111-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0977df4c9596556f9a34d030c66b1afd85842166
| * | | | | | | | Automatic translation importMichael Bestas2015-09-012-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f7b7885558177856a4fad13d62ee5eac51955f9
| * | | | | | | | Automatic translation importTom Powell2015-08-212-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0cce808b759d66ddeabf3ff8b7214200e5cdc87d
| * | | | | | | | Automatic translation importTom Powell2015-08-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a3015fbc166d55a8114e713752b3bef06efa082
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 16:17:21 +0000