summaryrefslogtreecommitdiffstats
path: root/res
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
* | 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
* | 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
| * | Import translations. DO NOT MERGEGeoff Mendal2015-07-113-8/+8
| | | | | | | | | | | | | | | Change-Id: Iaadd27db526c2ad464cffb9537c09e0771a87c07 Auto-generated-cl: translation import
* | | Gallery2: Revert DRM featureSteve Kondik2015-10-187-66/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-17322-336/+8900
|\ \ \ | | | | | | | | | | | | | | | | | | | | 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 : Drm lock icon added on Photo widget for drm contentParamananda2015-09-151-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | CRs-fixed : 804180 Change-Id: I11c969f0156dba6db75c924a568eaa0733395208
| * | | Gallery2 : Uses internal Drm image decoder api in Gallery appParamananda2015-09-152-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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: Make Gallery2 support OMADRM featureParamananda Pradhan2015-09-156-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | - Make Gallery2 can recognize and consume DRM images and videos. Change-Id: I1655d295bcec31b5760c2c86c06f815cf6ed57ee
| * | | Gallery3d : Fix CROP_ACTION for third party appsDanesh M2015-09-141-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Automatic translation importTom Powell2015-08-111-4/+4
| | | | | | | | | | | | | | | | Change-Id: I01ce4b14557c5e27980e1b5c6e8c3b3c31da758f
| * | | Automatic translation importMichael Bestas2015-08-051-1/+1
| | | | | | | | | | | | | | | | Change-Id: I3dcd2f86acb17e3ada6d730fc4f124db8e9203f9
| * | | Automatic translation importMichael Bestas2015-07-276-1/+288
| | | | | | | | | | | | | | | | Change-Id: Ie5570eb39fc784ae52b3277653d7aa8185cf2921
| * | | Automatic translation importMichael Bestas2015-07-191-0/+48
| | | | | | | | | | | | | | | | Change-Id: Id9e95a458783dd91b31b819786c6b97472f60424
| * | | Automatic translation importMichael Bestas2015-07-133-1/+42
| | | | | | | | | | | | | | | | Change-Id: I013c59b31a108d04003fc75967eae1dcfd18c6dd
| * | | Automatic translation importMichael Bestas2015-07-023-4/+10
| | | | | | | | | | | | | | | | Change-Id: Ib32eee9b6253292708e6206277cf451446ed3b3d
| * | | Automatic translation importMichael Bestas2015-06-231-0/+28
| | | | | | | | | | | | | | | | Change-Id: I7e02e03d3baaeee44a9b08da9877ac76b9d6f38e
| * | | Automatic translation importMichael Bestas2015-06-133-0/+103
| | | | | | | | | | | | | | | | Change-Id: I8c521bb53541a71f16ff3acd3192bfdced447bee
| * | | Automatic translation importMichael Bestas2015-06-092-0/+67
| | | | | | | | | | | | | | | | Change-Id: Ieb3bd9ade42df3cafd2e9d463b7a0b6e5135ad26
| * | | Automatic translation importMichael Bestas2015-05-243-2/+40
| | | | | | | | | | | | | | | | Change-Id: I93206765bcccbf174be7dcc85f103517097e6725
| * | | Automatic translation importMichael Bestas2015-05-163-0/+42
| | | | | | | | | | | | | | | | Change-Id: I40afea8c6faaea8f7de1c0e00084be29030d9f08
| * | | Automatic translation importMichael Bestas2015-05-023-0/+137
| | | | | | | | | | | | | | | | Change-Id: I3f3f7b03caf7b43162c0f87aee2886d51156f12d
| * | | Automatic translation importMichael Bestas2015-04-251-1/+1
| | | | | | | | | | | | | | | | Change-Id: I1f7033f03a82195905ac723b9daa2b389aadd1b7
| * | | Automatic translation importMichael Bestas2015-04-174-2/+120
| | | | | | | | | | | | | | | | Change-Id: Ia8a3817d7d07c085c800b276c1411855b69bf758
| * | | Automatic translation importMichael Bestas2015-04-171-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ifa6c8d665d25ddee7d4cad1f8019833f3edcbdf3
| * | | Automatic translation importMichael Bestas2015-04-171-0/+1
| | | | | | | | | | | | | | | | Change-Id: Iaa89ae9514149bc83e12c34fc8e200532adbccca
| * | | Automatic translation importMichael Bestas2015-04-175-1/+205
| | | | | | | | | | | | | | | | Change-Id: Ibd7d5773bd695c757cd77b35f0b8df1c119e8754
| * | | Automatic translation importMichael Bestas2015-04-174-2/+104
| | | | | | | | | | | | | | | | Change-Id: Ib1edaf2f04c5cec7840daa33701ca2dffb4d7226
| * | | Revert OMADRM feature.staging/cm-12.1Steve Kondik2015-03-286-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * No need for this. Revert "Gallery2 : Added support for Oma drm (CD and SD)" This reverts commit 6144de8cc35fdd114802545c9922a1a234af8397. Revert "Gallery2: Make Gallery2 support OMADRM feature" This reverts commit 9382a979292e52de5c60a39ba24688362dce8bc1. Change-Id: I13a0d69a792aad36d7b15bc0b3c78e3f55d396bc
| * | | gallery: Remove duplicate stringSteve Kondik2015-03-281-1/+0
| | | | | | | | | | | | | | | | Change-Id: I67c1e6468974d87d858754be3f7d2ae1f498f809
| * | | Automatic translation importMichael Bestas2015-03-282-9/+9
| | | | | | | | | | | | | | | | Change-Id: I0697d07c3202dc44169693b6476a0ca61a3f6c83
| * | | Automatic translation importMichael Bestas2015-03-285-4/+35
| | | | | | | | | | | | | | | | Change-Id: Ie32cb2cb3ba4d484b45e8520f13bab8fa927b131
| * | | Automatic translation importMichael Bestas2015-03-289-1/+20
| | | | | | | | | | | | | | | | Change-Id: Ic150917a3fd7acb8ab5c2490aa2287542de26ce5
| * | | Automatic translation importMichael Bestas2015-03-2885-0/+6099
| | | | | | | | | | | | | | | | Change-Id: I84d7838bf5b241fc9fd37be978439fbb962bd2fc