summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix null pointer crashingstable/cm-13.0-ZNH5YChih-Wei Huang2016-12-031-1/+1
| | | | | | RM-290 Change-Id: Ie55d1c37c05b334398b713db17353885a9125e3a
* Gallery: Remove more possible NPEsMichael W2016-12-032-0/+7
| | | | | | | | | getCache can return null -> check this before proceeding RM-290 Change-Id: I834780a4dafbe22f2d345fe5571cb20f3f3e5e2e
* Gallery2: Fix no android.permission.INTERACT_ACROSS_USERS in guest mode.yongga2016-09-161-0/+1
| | | | | | | | | | | | Guest don't have permission to set system property. add the permission for guest. RM-290 Change-Id: I8d63da7f94d27ee2ceb4a04b19d85afe097b1659 CRs-Fixed: 954666 95622 (cherry picked from commit 0304394f81c2c12d1da44db927c9b5d3bcedb9f3)
* Automatic translation importpinky@build012016-08-214-0/+693
| | | | | Change-Id: If85a9bced04abc9dd0ee8f89c1da04c5991644d8 Ticket: RM-290
* Automatic translation importpinky@build012016-08-190-0/+0
| | | | | Change-Id: I0142e3911d3b006ac70566714314604631aaf7d9 Ticket: RM-290
* Automatic translation importpinky@build012016-08-195-10/+703
| | | | | Change-Id: If9a636ef74c431ab6caacf54a00d4305ee0511b5 Ticket: RM-290
* Automatic translation importblinky@build012016-08-134-0/+693
| | | | | Change-Id: Ie988921fac58214d8cd094f3d6d93980e77e00bd Ticket: RM-290
* Gallery: Make sure no NPE happensMichael W2016-06-041-11/+15
| | | | | | Fix for the case when getExternalCacheDir returns null Change-Id: I15f4a4a37ac44d70d14ac08cd743d3327f91dde1
* Gallery: Try to open existing cameraMichael W2016-05-234-14/+17
| | | | | | | | | Do not just open Camera2, just open any existing cam Also get rid of context parameter as it's unused (Reference: BugReports 13-20160506-12 Line #5) Change-Id: I18514ee30411a639230840fc2f152b8331bbca3d
* Automatic translation importAbhisek Devkota2016-05-172-0/+7
| | | | Change-Id: I40b10e4bfdec1a8c4c6b8655388f6b581a81ffa0
* Automatic translation importAbhisek Devkota2016-05-151-0/+1
| | | | Change-Id: I2c0c9fcec6f2c2df4fc877af1cb19b081ad50453
* Revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-018-23/+23
| | | | | | | | | https://android.googlesource.com/platform/packages/apps/Gallery2 into cm-13.0" This reverts commit 8a0ab8f559fadc69978246f8f147ee1744770da1, reversing changes made to 515039d1f04467c7bf7f23ac94a5381a3daaa060. Change-Id: I913dca0c1e2e725ef4b1c60a88dc62078fffef04
* Automatic translation importMichael Bestas2016-04-166-0/+745
| | | | Change-Id: Ia3f4210500c334b34a48d5015e6d87b43c8121ba
* Automatic translation importMichael Bestas2016-04-065-5/+698
| | | | Change-Id: I834db5da2571857d27bcafa44459a31e510ad6f2
* Automatic translation importMichael Bestas2016-03-286-50/+1260
| | | | Change-Id: I6924d75400a0704972a82976ab786c1438b8cff9
* Automatic translation importMichael Bestas2016-03-1722-18/+556
| | | | Change-Id: I3fdb5302a8700c6c20ef5a715cf9de331bf3daa4
* 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