summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* SnapdragonCamera: Calculate in top bottom margin for the previewJack Yoo2016-02-161-2/+7
| | | | | | | | Subtract top and bottom margin from the max height of the preview Let it be aligned correctly to the top and center horizontally. Change-Id: I6c5b3fde57c1a514725a6316dbe8e0c799a928d0 CRs-Fixed: 965033
* SnapdragonCamera: Fix highlight after rotating deviceByunghun Jeon2016-02-161-0/+6
| | | | | | | Fix highlight disappear after rotating device in settings Change-Id: Ic51d95cd07dfb33d846c24cbc265177330542b7a CRs-Fixed: 956111
* SnapdragonCamera: fix the incorrect aspect ratio calculationCamera Software Integration2016-02-161-26/+30
| | | | | | | | | | | For square size picture, the function that calculates the closest aspect ratio, forced it to use 4:3 ratio and caused the preview stretched from 1:1 to 4:3. Fix the issue by skipping the logic that forces it to 4:3 aspect ratio when the picture size is square. Change-Id: Ia7d8250152ce37f4444f7db7c752eeb8489d9a2f CRs-Fixed: 955824
* SnapdragonCamera: Adjust margin on PhotoUICamera Software Integration2016-02-161-7/+9
| | | | | | | Adjust top and bottom margin on every ratio. Change-Id: I755c15039e355d13bcc08e6463f38deba668a234 CRs-Fixed: 951525
* SnapdragonCamera: Updating preview size againCamera Software Integration2016-02-162-0/+11
| | | | | | | | On layout change, need to call preview size change again as it's not guaranteed it's called first always. Change-Id: I8a687fbf162924f36f2ff7be2a3ba1c6304b27f6 CRs-Fixed: 893423
* SnapdragonCamera: Fix to make camera display normallylikaid2016-02-161-4/+10
| | | | | | | | | | Camera params is initialized twice when power on screen which cause this bug happen. Add judgement to make Camera params only be initialized once. CRs-Fixed: 914993 Change-Id: I825afe1e8fa9cda0d971c6f9bb4fe5677e06d809
* Revert "Snap: Support 1:1 aspect ratio"Arne Coucheron2016-02-161-4/+0
| | | | | | This reverts commit 4b6ac957f76dc33e77b05fe265a73737050ba50f. Change-Id: I7585ee977789eb9f90fe165870dcd1c230afc441
* De-uglify menu.Danny Baumann2016-02-155-30/+18
| | | | Change-Id: I19d8a3d5a12c4be06bced056b80ad1a354c6b761
* SnapdragonCamera: Fix NULL pointer exceptionJay Wang2016-02-111-1/+2
| | | | | | | | | There is a corner case that onShutterButtonClick() is called before camera device is configured. The change will make sure the camera device exists before continuing the operation. Change-Id: I2212572ea5c6073c3f62bdd38e83716b2427c87d CRs-Fixed: 962579
* Fix crash if Exif-Tag buffer-length and component-count are both 0tobigun2016-02-101-1/+1
| | | | Change-Id: Iad9b60d135b4f682c08c3bfc9698cdd10e1086ab
* Camera2: Only autofocus before a snap if we are actually in "auto" mode.Steve Kondik2016-02-101-4/+1
| | | | | | Original commit by cyanogen 7daaa72d35c1f8820117768e4b129acd030bcefb Change-Id: I51853913f6459b599176910f7f486f59972eaf36
* Snap: Fix crash when set infinite touch-focus durationMichael Bestas2016-02-102-2/+2
| | | | | | | * java.lang.Integer.valueOf(string) method can't parse hexadecimal values Change-Id: I42706db72fc9c1093a7aa16440af449f731e5176
* Snap: Expose video snapshot size settingMichael Bestas2016-02-071-0/+1
| | | | Change-Id: I6bf76a0a607e4c275a63c60b042ae239d893095f
* SnapdragonCamera: Set camera parameters before restarting previewSultanxda2016-02-071-0/+1
| | | | | | | | | Ensure that all of the updated camera parameters are propagated to the camera HAL prior to restarting the preview. This fixes the split-exposure observed when turning ZSL off and on without exiting the app. Change-Id: I392549ae7cc75b150e01cf8b635d2e3f1ad6ffb9 Signed-off-by: Sultanxda <sultanxda@gmail.com>
* Snap: Separate default focus time between camera/videoSultanxda2016-02-071-1/+1
| | | | | | | | | | | | | | For the camera, the user expects a default tap-to-focus duration of 3 seconds with exposure locking. For the camcorder, however, the user expects a tap-to-focus duration of 0 seconds with no exposure locking, as the rapid change in exposure while recording would negatively impact the video. Separate the tap-to-focus option to reflect the recommended defaults. [mikeioannina]: Adapted to Snap Change-Id: I75bc0610f5d301c9728b4bc104b86e0fab5493fb Signed-off-by: Sultanxda <sultanxda@gmail.com>
* Snap: Add ability to set the tap-to-focus duration to 0 secSultanxda2016-02-071-8/+15
| | | | | | | | | | | Setting a tap-to-focus duration of 0 seconds allows for a quick, manual refocus of the subject without interfering with the exposure. This is particularly useful when recording videos. [mikeioannina]: Adapted to Snap Change-Id: Ie3d92e50f755c938e9725438ba5baad0d0985485 Signed-off-by: Sultanxda <sultanxda@gmail.com>
* Snap: Add focus time support in camcorderMichael Bestas2016-02-073-0/+8
| | | | Change-Id: I5432554a40d7375ed7893c38cb2741a12cc8cc80
* SnapdragonCamera: Unlock AE/AWB after taking a photo with ZSLSultanxda2016-02-071-0/+1
| | | | | | | | | The exposure and white balance get stuck after taking photos with ZSL. Always unlock the exposure and white balance after taking photos with ZSL. Change-Id: Ia34a54522048fdd619f44ac1f6d2924ce2c3fc6a
* SnapdragonCamera: Lock AE and AWB for tap-to-focus in camcorderSultanxda2016-02-071-0/+20
| | | | | | | | Lock the auto exposure (AE) and auto white balance (AWB) when tap-to-focus is used in the camcorder. Change-Id: Ieb24e04b74a06b2390eb9302e74b4f69b1486951 Signed-off-by: Sultanxda <sultanxda@gmail.com>
* SnapdragonCamera: Always lock AE and AWB when auto-focus is usedSultanxda2016-02-071-0/+7
| | | | | | | | Lock the auto exposure (AE) and auto white balance (AWB) when tap-to-focus is used. Change-Id: I9d8e9b4928516e8b2bad7be958e5c4849db19ab6 Signed-off-by: Sultanxda <sultanxda@gmail.com>
* SnapdragonCamera: Add focus-mode option to camcorderSultanxda2016-02-075-22/+36
| | | | | | | User can now control the focus mode used while recording video. Change-Id: I340c01a3f88314de67ca024279672276eff453ed Signed-off-by: Sultanxda <sultanxda@gmail.com>
* Snap: Don't crash when hardcoded gallery intent failsEthan Chen2016-02-011-8/+16
| | | | | | | * startActivity may also throw IllegalArgumentException in addition to ActivityNotFoundException when the component can't be found. Change-Id: Ia3124591c625f4c249f3c6f76a226e8178df6e9d
* Snap: Restore flash mode settingCamera Software Integration2016-01-241-8/+33
| | | | | | | | | | | After user changes the scene mode back to "AUTO", making sure the flash mode is restored back to the correct value. Previously, the flash mode is forced to "OFF" if the scene mode is changed from others to "AUTO". Change-Id: I648ecc6945abb108c7bafa00c8e3e6d0cdd8f086 CRs-fixed: 927985 Signed-off-by: Zdrowy Gosciu <ZdrowyGosciu+GITHUB@gmail.com>
* Snap: do not restart preview during longshotscodeworkx2016-01-221-8/+9
| | | | Change-Id: I6ad439dc0be7c6e0d13ac7c22aacdc0ad559d051
* Fix up layout of auto HDR notice and histogram view.Danny Baumann2016-01-205-247/+215
| | | | Change-Id: I61f93c68b52d81c5e19919a5b0b894cf51dd35c4
* Remove unused menu indicators code.Danny Baumann2016-01-207-294/+2
| | | | Change-Id: I0ce48da277a532b46fdde15027f636de4d7585b7
* Avoid static member variable.Danny Baumann2016-01-206-18/+24
| | | | Change-Id: I3758bb219552d22768afa0af83c69c6a5460693b
* Improve CameraControls layout code.Danny Baumann2016-01-201-316/+148
| | | | | | Improve control placement, and clean up redundant code. Change-Id: Ia650b09be48a81d34241f7ab22c6b3db5032ada7
* SnapdragonCamera: Fix UI alignment glitches when nav-bar is enabledSultanxda2016-01-202-2/+2
| | | | | | | | | Snapdragon Camera is immersive (i.e. fullscreen), so we expect to receive the actual size of the display here, not the modified size when the nav-bar is enabled. Change-Id: I942829f77dda0dbb9dd65a60e66a540eecf708e7 Signed-off-by: Sultanxda <sultanxda@gmail.com>
* Snap: Don't enable ZSL when disabling HDRGabriele M2016-01-201-1/+2
| | | | | | | Instead, restore the default value. This prevents issues on devices that don't support ZSL. Change-Id: I9c456cd6503df29800e2bc7ccaa691cb3fb42681
* SnapdragonCamera: Fix overly-aggressive auto rotationSultanxda2016-01-191-2/+2
| | | | Change-Id: I534c0e36ac826b1d46befe99182bfbfb3b0f22da
* SnapdragonCamera: Add option to control antibanding in camcorderSultanxda2016-01-192-16/+8
| | | | | | | The antibanding setting in camcorder is linked to the setting in camera mode for better UX (if you change one, the other will change accordingly). Change-Id: I98c1bc65472cf8eec530f5a7572f46458b0ab3fa
* Snap: Enlarge the saving queue size to 60Mlikaid2016-01-182-3/+3
| | | | | | | | | | | | | | | The picture would not be saved if the saving queue is full. Currently, the queue is very easy to reach 50M during continuous shot with the 13M pixel pictures, that caused many pictures lost during continuous shot. Change the saving queue max size to 60M will avoid this issue, mean while change the LOW_STORAGE_THRESHOLD_BYTES as the same value. CRs-Fixed: 851554 Change-Id: Ib93f05404371872f2b82d489378c01a6122ccb6b Signed-off-by: Zdrowy Gosciu <ZdrowyGosciu+GITHUB@gmail.com>
* Revert "Camera: Propagate power mode selection from UI to lower layers."Ricardo Cerqueira2016-01-164-75/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5302d2e099de0ae1c3cb4a9cda993fe28b0e8c46, runtime power-mode changes are causing stability issues in camcorder Change-Id: I118f7c47bea2d07296dc18ed8a3a790eef592ca2 Revert "SnapdragonCamera: Disable LPM if DIS/Flip are enabled." This reverts commit 6cd860119a45b4a44d3e1314981862d9dac47955. Revert "SnapdragonCamera: Set low power mode by default." This reverts commit d4fccc04331a6a5a7038a542f7d17ecefa4ac95a. Revert "SnapdragonCamera: Enable low power mode in Camera." This reverts commit 195fccbe69e92b0312822aa762bb53d301c0f56f. Change-Id: I623626e60efc850fe182e54d9e9997ca41275579 [mikeioannina]: Remove the now obsolete power mode setting and unhide the video snapshot size setting Change-Id: I118f7c47bea2d07296dc18ed8a3a790eef592ca2
* Drop new focus indicator into Camera2.Paul Rohde2016-01-1529-243/+2121
| | | | | | | * Create a new custom focus view that interacts with physical lens diopter changes. * Replace all occurances of the old focus indicator with the new one. Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b
* Snap: Actually select the highest quality video by defaultChristopher R. Palmer2016-01-152-2/+9
| | | | | | | | | | | Prior to this commit Snap assumes that the HAL returns the list of supported video sizes in descending order of quality and simply picks the first one from the list as the default quality. Instead, find the first matching entry of pref_video_quality_entryvalues that the HAL indicated was supported. Change-Id: Ifea79e0e16a9015557539e098317536a32b9ff1f
* CameraActivity: Don't hide navigation barDanny Baumann2016-01-154-108/+60
| | | | | | * Make it transparent instead. Change-Id: I08b06ac72d88aaf62ae7f52a3dde9ba865bc3542
* SnapdragonCamera: limit video file size on SD cardlikaid2016-01-141-0/+6
| | | | | | | | | Videos over 4GB on SD card cannot be played correctly. Set a limit if video is stored on SD card. Change-Id: I9f658527c2f6ee4408b6f9c8c0b45e2b9ea9bf8b CRs-Fixed: 902533
* SnapdragonCamera: Hide all camera setting when countdown timer startslikaid2016-01-143-0/+30
| | | | | | | | | | | | Camera setting including module switcher scene mode filter mode and front/back camera switcher should not be used during countdown timer, since it may cause unexpected concurrent errors. Hide all the camera settings when countdown timer starts, show them again after countdown. Change-Id: I79c2add63c61d304fe0948e1c9fefe3a8c1a6fee CRs-Fixed: 900086
* SnapdragonCamera: Set color effect as none when turn HDR onlikaid2016-01-141-3/+11
| | | | | | | | | | Some color effects has special tone, if do HDR for specific color effects like Negative, we'll get unreasonable pictures. Disable the color effect when HDR on and set it as none effect. Change-Id: I8dca19b081504abaa85728b6d67b85699a184abb CRs-Fixed: 894360
* SnapdragonCamera: Fixing NullPointerException in onCreate of VideoModuleSanjeev Garg2016-01-142-1/+4
| | | | | | | | | | As per new open camera optimization, setContentView is called after init. But VideoModule has a dependency in initialization on setContentView as if setContentView is not called before using mFilmStripView then its value is null. To avoid this changed the location of using mFilmStripView from initialization to onResume. Change-Id: I6f0116fa82554b11b06d733b3952e6596daa50d3
* SnapdragonCamera: fix thumbnail displayLikai Ding2016-01-141-2/+4
| | | | | | | | | | | Thumbnail image is usually larger than needed due to the choice of down-sampling factor. When the decoded bitmap is square, it's width and height is not correctly set in CircularDrawable, so only the left-top part of the cropped image is shown. Set the size and only decode exactly the region for display. Change-Id: I5f4af66a08f0dc02d84bda605b74c9e2b782fe63 CRs-Fixed: 881895
* SnapdragonCamera: fix crash taking Macro+ from MMSLikai Ding2016-01-141-1/+4
| | | | | | | | For capture intent, preview stops as soon as first jpeg callback arrives, but Macro+ has 7 callbacks. Make preview stop after all jpeg callbacks. Change-Id: Id29cc745aa2030edb60bc15da10d9123fa95bfd0
* SnapdragonCamera: fix NumberFormatException when input value invalidelikaid2016-01-141-6/+33
| | | | | | | | | | NumberFormatException occurred when converted the invalid input values, for example, user only input "." for some float values. Catch the NumberFormatException and show invalid input toast. Change-Id: Ie10b204950d43cca22a06532f04b9569fa545cbb CRs-Fixed: 862960
* Snap: Remove touch AF/AEC optionSteve Kondik2016-01-143-58/+11
| | | | | | | * Drop the use of the touchaf-aec parameter entirely. No camera needs this anymore. Change-Id: I83154a75e5375901dc6c0fc93aef23637cfdf425
* Snap: Support 1:1 aspect ratioArne Coucheron2016-01-141-0/+4
| | | | | | | | Some cameras (front cameras especially) supports 1.9M resolution (1392x1392), and shows stretched in preview. Add support for 1:1 aspect ratio, so preview is shown correctly. Change-Id: I66a02d6eae8fed356b4252c7893cc76e4e62d3e9
* Snap: Support for HTC's HDR modeSteve Kondik2016-01-132-12/+13
| | | | | | | | | | * HDR was never actually working on CM because we did not instruct the camera to take all exposures. The HAL tells us that we'll get one JPEG, but we should snap 3 times. We handle this behavior in the framework now, but we should honor the num-jpegs-per-shutter value in the JPEG callback. Change-Id: I7124bf08985ae23b21ac4e294fb889ac4106946b
* Snap: special handling of hdr-mode parameter for lge devicescodeworkx2016-01-112-17/+42
| | | | Change-Id: Iefee1f15f5649c2f93c59fcbdedcf953e9e0bc54
* Fix mismerge of "SnapdragonCamera: fix screen flash on resuming"Arne Coucheron2016-01-111-1/+0
| | | | Change-Id: I9c2c7a74b5816b3f930e22ee1fce625e7ad768e3
* Don't do touch-to-focus for touches outside of the preview.Danny Baumann2016-01-112-7/+1
| | | | | | | | | | Issue was twofold: - Preview size was updated from the root view instead of the preview surface view. As the preview rect is already correctly updated from the surface view, remove the redundant size update code. - Touches outside of the preview rect weren't discarded properly. Change-Id: I1c9a4398aa51a828b5362fcd7bcd5a7a7e4691db