summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/util/CameraUtil.java
Commit message (Collapse)AuthorAgeFilesLines
...
| * SnapdragonCamera: fix app crash when there is no map appkaiyiz2014-11-301-2/+8
| | | | | | | | | | | | | | | | | | | | | | ActivityNotFoundException happened after click showOnMap menu when there is no map app. Catch the Exception to avoid app crash. CRs-Fixed: 753928 Change-Id: I1cf6e5f098f239719750840508b715a08e9a5e45
* | SnapdragonCamera: Forbid volume key can take picturekaiyiz2014-11-131-0/+4
|/ | | | | | | | | | | In CMCC Mode, don't need take picture when press volume key. Add a boolean value for judge whether need to take picture when press volume key, and overlay it in Carrier package. CRs-Fixed: 685391 Change-Id: Ice83c93ea417c1e64cbc5c6751d5f7e38c07606a
* SnapdragonCamera: Add OptimalJpegThumbnailSize selction logic in APP.satyavaraprasad yerramsetti2014-10-311-0/+32
| | | | | | | | | | | - Set a jpegthumbnail size that is closest to the Picture height and has the right aspect ratio. - Earlier this logic was implemented in HAL but due to CTS2 testJpegExif failure, moving this to APP CRs-Fixed: 748114 Change-Id: Ia2c97bf8cec7198ee291e63c3be9bbe5fb18b3b7
* Rename module and package name to co-exist with AOSP appSachin Shah2014-08-161-1/+1
| | | | | | | | 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: Initial Refocus supportEmilian Peev2014-06-261-9/+34
| | | | | | | | | Refocus mode is enabled which expects 7 snapshots in burst from the camera. The captured images are stored with custom names. Change-Id: I7c1f9ef15d710118f7089c2fc584da450ab0984c
* Camera2: Adding support for Auto HDRAbhishek Pant2014-06-061-0/+4
| | | | | | | | Adding support for Auto HDR for camera application. CRs-fixed: 629556 Change-Id: I02cdc2accb3e9fd4a9039b7f632ba3eb04fcc798
* Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-061-17/+31
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Import translations. DO NOT MERGE gcam: Clean up placeholders, and add deletion robustness. Fix issue of focus indicator staying on without being hidden Ensure view size gets updated after phone decors change. Show the 100% state of the progress at least one frame. Add parameters and deduplicate parameter changes Revert parallel opening camera in photo mode. Differentiate the InProgressData from the normal PhotoData. Close mode menus if another control is touched Start gcam module directly when handling capture intent. Import translations. DO NOT MERGE Add a null check to fix NPE Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. ... Conflicts: res/layout/photo_module.xml res/values/arrays.xml src/com/android/camera/CameraActivity.java src/com/android/camera/PhotoUI.java src/com/android/camera/Storage.java src/com/android/camera/WideAnglePanoramaModule.java src/com/android/camera/ui/FilmStripView.java Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f
| * Add logging to various actionsSeth Raphael2013-11-071-0/+2
| | | | | | | | | | | | Bug: 11514148 Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2
| * Merge "gcam: Add generic preview fps range selection." into ↵Ruben Brunk2013-10-311-1/+4
| |\ | | | | | | | | | gb-ub-photos-carlsbad
| | * gcam: Add generic preview fps range selection.Ruben Brunk2013-10-291-1/+4
| | | | | | | | | | | | | | | Bug: 11433097 Change-Id: Ice0f7ad3cd0684183298ce03bab3038a41316cf6
| * | Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up iconAlan Newberger2013-10-301-16/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | CameraUtil.launchGallery incorrectly describes a mechanism to call an APP_GALLERY category intent. Since we're using Gallery icon we should go direct to Gallery, which IntentHelper already does. Simply removed the util class and call the helper direct from the activity. Also noticed during testing that the SecureCamera was not correctly showing the Gallery icon, though its behavior would take user to Gallery. Finally, removing restriction that the video player intent should go to Gallery, instead it should route to system preferred intent. Bug: 11065256 Change-Id: I941f9469de169919c4bac6c91dde7e577921f737
| * Fix the mapping between preview UI and camera sensorDoris Liu2013-10-281-0/+25
| | | | | | | | | | Bug: 11409659 Change-Id: I46ae3d7797590d59befbdc394d5304f14a212a80
* | Camera2: Fix compilation issuesManish Kumar2013-10-311-0/+1
| | | | | | | | | | | | | | | | Fix compilation issues Change-Id: I77317b64eb11663dadff6a0b46e08e49d9e8ab21 (cherry picked from commit 53fa3ae8cd74ce42810f6d638bb7efe15fd01ba4) (cherry picked from commit 4151656344e66f7f43f017ab33ff42a33e6df552)
* | Camera: Support stream based flipAlok Kediya2013-10-311-2/+15
|/ | | | | | | | | | | | | | | | | | | Flip operation needs to be done per stream. App will read from system property about stream based flipping setting and set corresponding parameters to let camera hardware to apply flipping setting per stream. To keep app behavior persistent when flip and rotation are enabled, need to take case H/V flip when 90 or 270 rotation happens. Need to reverse H/V flip to acheive same output no matter device is in portait or landscape mode. (cherrypicked from commit b38b8246204871082dc7ac6f5e626d6162d2be70) Change-Id: Ia06060709162237dece1a05a3ae58429a0c99b06 Conflicts: src/com/android/camera/util/CameraUtil.java (cherry picked from commit b6aff328cdd99fb0db11c989a72f5eafd7d82324) (cherry picked from commit 29888be992b8955f88a2f89ffd407733d771c1e6)
* Fix shutter covering pie menuDoris Liu2013-10-161-0/+23
| | | | | Bug: 11247988 Change-Id: I2018075a0b8adf7cacb302774ed64df92fc2fa7c
* Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbadIgor Murashkin2013-10-151-1/+7
|\
| * CameraUtil: add float clamp functionIgor Murashkin2013-10-141-1/+7
| | | | | | | | | | Bug: 10936156 Change-Id: I5fbaf399ed8ca0206d23aa7d0af11c9b8a1debe5
* | Use Gallery intents by default.Mangesh Ghiware2013-10-141-4/+3
|/ | | | | Bug: 11226016 Change-Id: I4f6a5856dd8141930fb0fef19b9ded0b37ea1ce5
* Finish the secure camera activity when user try to play a video.ztenghui2013-10-111-5/+13
| | | | | | bug:11190995 Change-Id: I8aa1a538496c291d34ca25d489a7eb03f0c90b53
* gcam: Fix preview FOV.Ruben Brunk2013-10-091-14/+30
| | | | | Bug: 11150965 Change-Id: Iacdcc7ad37193f5343d2c5d5de3fabecee1f05df
* Merge "Allow user to tap on lock icon from secure camera." into ↵Angus Kong2013-09-241-0/+17
|\ | | | | | | gb-ub-photos-carlsbad
| * Allow user to tap on lock icon from secure camera.Angus Kong2013-09-231-0/+17
| | | | | | | | | | | | bug:10857973 Change-Id: Id3c03f4d83c676986748ed083e85e85cea8eb507
* | Merge "Sort and select the preview fps range for still image." into ↵ztenghui2013-09-231-0/+52
|\ \ | |/ |/| | | gb-ub-photos-carlsbad
| * Sort and select the preview fps range for still image.ztenghui2013-09-231-0/+52
| | | | | | | | | | | | bug:10842868 Change-Id: Ic7d64aead7fd877e2c404d22ce42fd2d3566e57b
* | Improve the animation to filmstrip.Angus Kong2013-09-201-3/+9
|/ | | | | | | | | | | 1. Remove the snap-in-center check at the end of scale animation. 2. Don't go back to full-screen when animating from camera preview to filmstrip. bug:10806298 bug:10864100 Change-Id: I751040a22e2758709c22e7230a5418a871ef85f9
* Refine Filmstrip gesture/position handling.Angus Kong2013-09-191-0/+12
| | | | | | | | bug:10749052 bug:10802996 bug:10711578 Change-Id: I9080a930209118a5c1bdc11b1ef7b316c55a741e
* Clean up ApiHelper and remove unused code paths.Sascha Haeberling2013-09-181-42/+19
| | | | | | | | | Bug: 10821545 As we're targeting ICS there are a lot of checks and code paths that are no longer in use. This CL cleans them up. Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
* Show dialog when camera device is not connected.Angus Kong2013-09-171-13/+13
| | | | | | bug:10726516 Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c
* Make sure we switch to preview view when resuming.Sascha Haeberling2013-09-091-24/+9
| | | | | | | | | | Bug: 10640328 But we need to make sure to not always switch in onResume, as some activities stared from us (like playing a video or editing) require the UI flow to stay in filmstrip. Change-Id: Id2911be4949de9fd9fc4cb3451dd34e3fae8becf
* Implent show-on-map functionality.Sascha Haeberling2013-08-151-3/+38
| | | | | | | | | Also make sure the show-on-map item is only shown for items with coordinates. and add the coordinate to the details view. Bug: 10346208 Bug: 10330505 Change-Id: Idaeec207bcc0e7311fa3b651868515ccea81d083
* Defining broadcast intent strings as constants in CameraUtil.java.Dan Aminzade2013-08-151-0/+10
| | | | | | | | For now I'm leaving the definition within the Camera application. If we decide we want to publicize and document these intents as part of the Android API, we could move the definitions to Camera.java. Change-Id: Ia198b843245b70d7378e1ea81ecb8b7983486446
* Clean up Gallery codes.Angus Kong2013-08-091-0/+825
bug:10263696 Change-Id: I3a16dba3aabe52b8103a2c591cfa39907265a263