summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* SnapdragonCamera: Adding PRIVILEGED trueJack Yoo2016-08-251-0/+1
| | | | | | | Promoting privilege for direct SD card path access. Change-Id: I10f28606a646a85c0cb23e4cf8e617eafdcaa2b4 CRs-Fixed: 1032564
* Minimum viable Android M runtime permissions handling for H.zafir2016-08-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates new activity for permissions handling: both checking for permissions and handling error condition when critical permissions are not present. The reason for creating a new activity is so the app does not attempt to continue executing OnCreate, OnResume etc, which opens the camera while the dialogs are showing. This should not slow the app down because the permissions activity will only run when a) the first time the app has insufficient permissions and b) when a critical permission is missing and the app needs to shut down. Bug: 21273463 CRs-Fixed: 1019847 Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5 (cherry picked from commit ad44cda82fe6ec5ee090115129223c6314f9e1bb) Fixes to M permissions. Previously, we called PermissionsActivity with startActivityForResult(). However, this creates race conditions as we check for permissions and the CameraActivity continues to operate. Now, we end CameraActivity and launch a new instance upon successful permissions resolution. We can also put the preload filmstrip logic back in its original place in onCreate. The checks for permissions happen in both onCreate and onResume. Bug: 22442745, 22478144, 22497152 CRs-Fixed: 1019847 Change-Id: I82e9125a46581db44aa61d4ee94aec5a820e9df0 (cherry picked from commit ac0e2425e77a9b69e76d2f31876798825ea44584) SnapdragonCamera: Fixed M permission issue - Resolved NPE while sending permission request - Made change to request non-critical permissions once only, but the critical permssions all th time. - Removed unused contant defines CRs-Fixed: 1019847 Change-Id: Ib997244cbcc041d86c094c7ee7a902bff56e92ad snap: Remove platform signature * We are using runtime permissions now. Change-Id: I3386214dbbc0915251941ef490e7cbaf27e6ed45
* Snap: initial materializationjrizzoli2016-01-091-2/+3
| | | | | | | Just for initial ship Change-Id: I8d6c0d71d1b94e6eb2f43ab962fb92de0e6c7093 Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
* Rename SnapdragonCamera to SnapMichael Bestas2015-08-291-3/+5
| | | | Change-Id: I1474550af7f45e53aa97819b42a91c961eeb6684
* SnapdragonCamera: Remove Camera2 apk.Sai Kumar Sanagavarapu2015-01-081-0/+2
| | | | | | | | | | | Override Camera2 with SnapdragonCamera to remove Camera2 from build. This is to avoid confusion to user with similar camera apps in the build. Finally, there will be only two camera applications - SnapdragonCamera, which is the QC value added Camera app and another GoogleCamera, which is the stock Camera app provided by Google. Change-Id: Ifc50772848b5a5e9a64bc0371bd6980d8633e8ac
* SnapdragonCamera: Fix normal app could not access SDCardkaiyiz2014-11-131-0/+1
| | | | | | | | | | | | Only system application which was signed with platform certification can access the external SD card. Add 'LOCAL_CERTIFICATE := platform' in the 'Android.mk' of the application. CRs-Fixed: 752264 Change-Id: Ia84e7819b93dc429aac0bee601bd299c967d5457
* SnapdragonCamera: Enable build of local jni librariesLeena Winterrowd2014-08-231-1/+1
| | | | | | | | | The app currently relies on having its required libraries in the current build. Enable building its local libraries so that these are always present. Also ensure that the camera tests are not built to avoid a naming conflict. Change-Id: If358db3fc7392f62aaaa84877baa19a949aea497
* SnapdragonCamera: Fix static library name conflictLeena Winterrowd2014-08-171-3/+3
| | | | | | | | | A JNI lib is built for both the Camera2 app and SnapdragonCamera but is included in system/lib. Since this lib has been branched as well, rename it and explicitly bundle it with the app to avoid the library name conflict. Change-Id: I3177d0a99be06cef0b841d8e84e652b8974cadc6
* Rename module and package name to co-exist with AOSP appSachin Shah2014-08-161-2/+2
| | | | | | | | Rename package from com.android.camera2 to org.codeaurora.snapcam, module name from Camera2 to SnapdragonCamera and app name from "Camera" to "Snapdragon Camera" Change-Id: I2800070e72631e119a15fe0132424d1047be9f0c
* Camera: Add initial QCom value add features.Alok Kediya2013-11-011-1/+1
| | | | | | | | | | | | | | | - Enhance the camera picture size table by adding more number of supported resolutions. - Enhance the camcorder menu by adding support for additional video and audio codecs. - Also provide option to select the duration of the recording clip. (cherry picked from commit 7a5402332f3b527767b85c1fc112880d02a47c0e) Change-Id: I553d4eb74337701bc57d069c8374646a7e15c2d5 (cherry picked from commit cdffd7510e1f9a236e43438f035bc5be9e3c0c17) (cherry picked from commit 93c32e9e069d7c48b71fbbe45cae59a54df443ec) (cherry picked from commit f6b24346ab9d28953a5697924d6815ed2c006cf3)
* Fix build: Don't build GCam for non-arm targetsRuben Brunk2013-09-231-0/+1
| | | | | | Bug: 10430748 Change-Id: I26e1208b38f40808ff59e3976f5c4a76efa15b4c
* Bring back tiny planet to the Camera filmstripSascha Haeberling2013-09-131-2/+2
| | | | | | | | | Bug: 10393598 The native code and XmpUtil are mostly 1:1 copies from Gallery2. The UI is new and should work on all form factors. Change-Id: Ia302a4a7a24cf0b3aa583836683c459e9e7e1f85
* Bring back wide angle panorama.Angus Kong2013-09-041-0/+9
| | | | | | bug:10293937 Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05
* Merge "Automatic versioning for Camera." into gb-ub-photos-carlsbadSascha Haeberling2013-08-301-2/+7
|\
| * Automatic versioning for Camera.Sascha Haeberling2013-08-281-2/+7
| | | | | | | | | | | | | | | | | | | | Bug: 10461009 This is the scheme copied from GMS Core and modified by Babel, which allows us to generate version number more easily and also incorporate build numbers into it. Change-Id: I6ed4bf03e545a22423cb9936a5fcb67a50133490
* | Add rotate support in Film Stripztenghui2013-08-281-1/+0
|/ | | | | | | | | Move the exif related code under src.com.android.camera.exif. Refactor the member variables under LocalMediaData.java. Refactor the LocalData to make sure they are immutables for thread safety. bug:10367037 Change-Id: I0e84bcc0097925b2be749fe016984177a68e0a4d
* Add .mk files for Camera2.Sascha Haeberling2013-08-061-0/+27
| | | | Change-Id: I0678c1b12f40f6dfd76d7589f61d18e99997394f
* Remove all .mk files from the cloned Camera2 until the project isSascha Haeberling2013-08-061-56/+0
| | | | | | properly set up. Change-Id: I3eb79a7a756793ac5253b8c40c3fbc6c6fe2e8e3
* Added jpeg streaming classes.Ruben Brunk2013-07-111-2/+2
| | | | | | | | | - Provides streaming operations for decompressing/compressing JPEG files. - Allows pixel operations to be performed on large JPEG images without holding the entire bitmap in memory. Change-Id: I597ddf282b59d2ba6d6bca4722208121e3728f94
* Remove SRI panoramaDoris Liu2013-06-211-3/+3
| | | | Change-Id: Icbe154aede474fb678ae4e0b2088626a4a8b31d8
* Use hyphenated path for android-support-v8-renderscript.Stephen Hines2013-05-291-1/+1
| | | | | Bug: 9188088 Change-Id: Id435b35712fd944369b8515f7f84ea30f1eecbe3
* Only link librsjni in unbundled branches.Tim Murray2013-05-131-1/+1
| | | | | | bug 8939828 Change-Id: I87d28185c6fb2b23852eb66487bf99d6111c3a7a
* Merge "Remove com.android.camera.R" into gb-ub-photos-bryceJohn Reck2013-02-161-2/+1
|\
| * Remove com.android.camera.RJohn Reck2013-02-151-2/+1
| | | | | | | | Change-Id: I0bb03da1423401f872c3bf13caffb9c87d850449
* | Switch to GalleryGoogle as default provider for RS files (from Gallery2).Stephen Hines2013-02-091-1/+7
|/ | | | | Bug: 8138884 Change-Id: Ib2484852f0fa4299f6d0797838420493ce2607a0
* Switch Gallery over to RS compatibility library.Tim Murray2013-02-041-2/+7
| | | | Change-Id: If27809236534f3b196949bf455faed45c99f3da5
* Copy camera resources into Gallery2Michael Kolb2013-01-291-2/+1
| | | | Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684
* Move Camera Java/Native source into Gallery2Michael Kolb2013-01-291-5/+2
| | | | Change-Id: I968efe4d656e88a7760d3c0044f65b4adac2ddd1
* Revert "Switch Gallery over to RS compatibility library."Stephen Hines2013-01-231-8/+3
| | | | | | This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
* Switch Gallery over to RS compatibility library.Stephen Hines2013-01-231-3/+8
| | | | Change-Id: If6eaea15a12a1448b402fb00dfd770b3749471ad
* remove actionbar sherlockJohn Reck2012-12-121-3/+1
| | | | Change-Id: Idb9b63f625fd4f0b78d947421ec5b098d8e5dfd5
* Gingerbread support-ishJohn Reck2012-10-311-1/+3
| | | | | | This reverts commit 1336062985c9824d7fd796b1cebd5eaa8e4163ca. Change-Id: I718ec56315dc207a3e612abb4576bddab9afa2ee
* Make sure we use xmp_toolkit from external instead of the precompiled JAR.Sascha Haeberling2012-10-231-1/+1
| | | | | | Bug: 7400527 Change-Id: Ib9428af28c2c436485358dc4e07fe659ed961155
* on entry check if Tiny Planet if not remove UIJohn Hoford2012-10-231-0/+1
| | | | | bug:7391885 Change-Id: Ic2bffa9f9fbaa2d437ce231a1478a1b63a0eed83
* Change LOCAL_SDK_VERSION to current.Wu-cheng Li2012-10-061-1/+1
| | | | | | bug:7208909 Change-Id: Ifa03d6eea219115a03da6f8138c6fcb2922e4c57
* Implement sharpennicolasroard2012-10-051-1/+1
| | | | | | | | | | | | | bug:7279964 bug:7247494 bug:7234321 - add a sharpen filter - add infrastructure to use RenderScript - some refactoring (add an ImageSlave class) - add new zoom UI Change-Id: Id94dc94d32866c7107b6818adf4db35d0c6c0b01
* Remove ActionBarSherlockOwen Lin2012-10-021-3/+1
| | | | | | bug: 7242682 Change-Id: Ibf1fa136cafdca25273ee39ae9c065560b2db5cb
* Add FilterShow and clean up native lib handlingBart Sears2012-09-281-3/+8
| | | | | | | | | | Bug: 7165910 Add libjni_filtershow_filters to Gallery2 so users can edit photos Bug: 7250099 Remove native libs from the apk in /system/apps Change-Id: I0a8adacdcb4c349861187e4303d08666e204a266
* The trimming solution with the mp4parser library.Teng-Hui Zhu2012-09-241-1/+2
| | | | | | bug:7093055 Change-Id: I598a81d80c9c5107696f3af7761207e3ec88f3ff
* Revert "Revert "Uses ActionBarSherlock library in MovieActivity.""Owen Lin2012-08-241-2/+7
| | | | This reverts commit 13da281769d4558c42d86a54536ff6da6826b0ac.
* Revert "Uses ActionBarSherlock library in MovieActivity."Owen Lin2012-08-241-7/+2
| | | | This reverts commit 89b437722a24d0c7d6e2acffc30c215f22814234.
* Uses ActionBarSherlock library in MovieActivity.Owen Lin2012-08-241-2/+7
| | | | | | bug: 6927267 Change-Id: I4b63e41be5cff22af0f7d830739c719e91cd6fff
* Change "current" sdk version to 16 as it becomes officialYing Wang2012-07-131-1/+1
| | | | Change-Id: I09c13b99ff1bc368e1fa335f2efc4cba5410d2f5
* Make gallery/camera build in JB API level.Wu-cheng Li2012-06-291-1/+1
| | | | | Bug:4965992 Change-Id: I91e56aacb5447c811aafce756292ab5ee0636cee
* Fix b/6590795 dejank photo effect sliderRuei-sung Lin2012-06-021-3/+7
| | | | Change-Id: I14737bd01361b58c6bd4af19957d514368cc19ea
* Merge Camera into Gallery package.Chih-Chung Chang2012-03-081-3/+15
| | | | Change-Id: If66d4b841eec3d3f5384a561b07c0eeade92597a
* Initial code for Gallery2.Owen Lin2011-08-181-0/+24
fix: 5176434 Change-Id: I041e282b9c7b34ceb1db8b033be2b853bb3a992c