summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui
Commit message (Collapse)AuthorAgeFilesLines
...
| * | SnapdragonCamera: Fix preview broken when coming back from galleryByunghun Jeon2015-03-061-3/+4
| |/ | | | | | | | | | | | | | | | | Fix preview broken when user goes to gallery using thumbnail in portrait, rotates to landscape in gallery and back key to come back to camera Change-Id: Ib9a8ce69bfbb85573cae55da79901705f726cc22 CRs-Fixed: 802169
* / SnapdragonCamera: Draw the mouth position according to the orientationlikaid2015-03-101-22/+21
|/ | | | | | | | | | The mouth position on FaceView wasn't right in landscape mode because the orientation didn't change when rotated device. Re-correct the position of mouth when the device orientation changed. Change-Id: I81115bda8636e24484f2bda55415ebc0fa0a1f9a CRs-Fixed: 792980
* Merge "SnapdragonCamera: don't hide count down title"Linux Build Service Account2015-02-251-4/+17
|\
| * SnapdragonCamera: don't hide count down titleLikai Ding2015-02-171-4/+17
| | | | | | | | | | | | | | | | Don't hide count down title, instead, rotate and offset it to correct position. Change-Id: I31aca121bc7f8b5e672b6457e049c186ac1179d3 (cherry picked from commit 7023e606647cb5c2b60582a3755309565748f1fd)
* | SnapdragonCamera: circular thumbnail iconLikai Ding2015-02-171-2/+2
|/ | | | | | | | | | 1. change thumbnail icon to circular and its background to transparent 2. speed up loading with optimal sample size and region decoder 3. fix orientation bug regarding panorama photos 4. don't fire load task on fake onDataLoaded() call Change-Id: I7f4eb8dad4c54a01a7ccd98907e06952e470840b (cherry picked from commit ac714ea974b4bd0ef99403def5aa7d8a3deecc5d)
* SnapdragonCamera: Add FullScreen Preview when in Panoramic shootJay Wang2015-02-091-7/+11
| | | | | | | | | Changed the Panoramic preview to full screen Resized the warped preview image to smaller Size and render on top of the full screen preview image Warped preview image can be turned on/off Change-Id: I859839542ce94c5f70d7fe7983e93b5e9534b415
* SnapdragonCamera: fix portrait orientationLikai Ding2015-02-026-48/+128
| | | | | | | | | | | | Fix camera activity to portrait, so there is no delay when rotation occurs. Main changes are: 1. RotateLayout now supports padding and dynamically added child. 2. Camera controls and gesture detetion are now orientation-aware. 3. Toasts are replaced with RotateTextToast. 4. Obselete layout files are removed. Change-Id: I338849bd7fb84b847eb357f771a24a5cc09bf6fa
* Merge "SnapdragonCamera: New shutter Icons"Linux Build Service Account2015-01-231-4/+6
|\
| * SnapdragonCamera: New shutter IconsByunghun Jeon2015-01-201-4/+6
| | | | | | | | | | | | Add new shutter icons for SnapdragonCamera Change-Id: Ic0abf1b509800133bbd9dbee0cc34ebca02e5bcb
* | SnapdragonCamera: implement refocus featureLikai Ding2015-01-141-1/+105
|/ | | | | | | | Add a scene mode for refocus. If the latest photo is taken with refocus, user can click on the preview thumbnail, then refocus it by tapping on the photo. Change-Id: I2fd69439467f5a1e33d23d8d239aa3472d88b585
* SnapdragonCamera: support 4:3 preview on 16:9 screenLikai Ding2015-01-081-3/+71
| | | | | | | | When preview is set to 4:3 on a 16:9 screen, resize SurfaceView to 4:3 and cover other parts of the screen. Otherwise camera controls have a semi-transparent background. Change-Id: Icfbe6318b6a9de9a988468078b474e842f6ddd8c
* Merge "SnapdragonCamera: fix app crash when switch to camcorder"Linux Build Service Account2015-01-071-4/+2
|\
| * SnapdragonCamera: fix app crash when switch to camcorderkaiyiz2014-12-161-4/+2
| | | | | | | | | | | | | | | | | | | | Camera app crash when switch to camcorder during continuously shooting. Prohibition click event when continuously shooting. CRs-Fixed: 744811 Change-Id: Ia51ca53d46e060c2a4f4e877c37f795526532be7
* | Merge "Camera: Draw mouth indicator based on display orientation"Linux Build Service Account2015-01-061-5/+12
|\ \
| * | Camera: Draw mouth indicator based on display orientationJing (Mia) Wang2014-12-221-5/+12
| |/ | | | | | | | | | | | | | | | | Without this, mouth indicator is always drawn horizontally which is a vertical line in 90 and 270 degree cases. CRs-Fixed: 773385 Change-Id: I3ff1cae10a3131691e447f8b4f4bcef9ebb2f26c
* | Merge "SnapdragonCamera: Fix menu is covered when count down take picture"Linux Build Service Account2015-01-061-0/+15
|\ \
| * | SnapdragonCamera: Fix menu is covered when count down take pictureJing (Mia) Wang2014-12-201-0/+15
| |/ | | | | | | | | | | | | | | | | | | | | The textview of count down title layout is unreasonable, which lead to some view is covered by text. Modify the layout params of textview. CRs-Fixed: 773384 Change-Id: I4c6cd67dcc275730de1ad61396a86f3d7250b90b
* / SnapdragonCamera: show how many more pictures can be takenLikai Ding2014-12-221-0/+51
|/ | | | | | | Prompt to user an estimation of how many more pictures can be taken, calculated based on available storage. Change-Id: Iabc8268d548d3f6d86a6d065b511641b837a1de5
* Camera2: Reset zoom parameter after updatekaiyiz2014-12-121-0/+1
| | | | | | | | | | | | When exif data of a photo is changed, the view will update, but the zoom parameter is not reset, and the image load the zoomed image which is not exists, so there will be a black view. When photo is update, reset zoom view to full image. CRs-Fixed: 745326 Change-Id: I48a0a12241087ff9e99be83234b47b21c63b1867
* SnapdragonCamera: Add back missing setting menusByunghun Jeon2014-11-193-10/+14
| | | | | | Adding back missing setting menus Change-Id: I803d3f694b1953aa6a8932cbba6bb55c0d0e6352
* SnapdragonCamera: Add preview thumbnail buttonByunghun Jeon2014-11-192-52/+40
| | | | | | Add preview thumbnail button and touch it to go to gallery Change-Id: Ib80ef94c677c204d7f0826356792aba2aa11d4d1
* SnapdragonCamera: Use MDP composition instead of GPUByunghun Jeon2014-11-171-1/+4
| | | | | | Use MDP composition instead of GPU Change-Id: I4f47d26365bd611242a21e66b232d7521b502b04
* SnapdragonCamera: Update UI with new icons and setting menusByunghun Jeon2014-11-171-1/+1
| | | | | | Updating icons and settings menus for SnapdragonCamera UI Change-Id: Id7db7d624a517f76f5bd5941ed113e8d13d6aca1
* SnapdragonCamera: Modify SnapdragonCamera UIByunghun Jeon2014-11-177-104/+1185
| | | | | | Modified SnapdragonCamera setting menus with new icons Change-Id: I726296dfb100ac81ad6f1cd84420ae27c0ae1201
* Camera: Rotate face mouth based on face orientationEmilian Peev2014-10-141-14/+15
| | | | | | | | Face mouth can be rotated according to the face orientation information. Change-Id: Id00fd52e529ddeace54e031dea221f694e48e97c CRs-Fixed: 726313
* Rename module and package name to co-exist with AOSP appSachin Shah2014-08-1620-20/+20
| | | | | | | | 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
* Camera2: optionally force count down soundLikai Ding2014-07-091-2/+6
| | | | | | | set count down sound as STREAM_SYSTEM_ENFORCED for carrier compliance Change-Id: Ie60bb4c7059ad8930be2c6650808107dcaaa22a2 CRs-Fixed: 684591
* Camera2: Fix face eyes display incorrect when face detection is onkaiyiz2014-05-201-16/+50
| | | | | | | | | | | There is no difference to the eye display when in horizontal screen and vertical screen. Add operations to display eyes line in horizontal screen. CRs-fixed: 637286 Change-Id: I5337fec876b3d868de9f3ba2f1b60a54810d8226
* Camera: Fix mouth position when no smile detectedAshwini Rao2014-04-141-4/+5
| | | | | | | Fix a problem with the mouth poisition calculation to draw the mouth at the center. Change-Id: I8165a555e3b8c62f0c583950b831b58519d5a933
* Camera2: fix the wrong display issue of left eye when blinkingKerong Sui2014-04-021-1/+1
| | | | | | | | When we enable face detection, the left eye display incorrect on blinking eye. so make the display the same as right eye Change-Id: I94b74d6fbf8c784924acfaa49ef5b183b92f6405 CRs-fixed: 637286
* Camera2: fix the display error of camera menu when rotate itKerong Sui2014-03-211-4/+2
| | | | | | | including: menu of native camera and camcoder.we should use the right LayoutId for every view when in landscape mode Change-Id: I768a64f32a59c1b89b366409a5e05bf1c0755b0c
* Camera: Draw smile indicator based on display orientationIvan Evlogiev2014-03-111-4/+12
| | | | | | | | | Without this, smile indicator is always drawn horizontally which is a vertical line in 90 and 270 degree cases. CRs-Fixed: 539887 587195 Change-Id: I320b90a7a8981075565171e69b64e7d3dc832a6f
* Camera: Add facial processing featuresIvan Evlogiev2014-03-111-0/+122
| | | | | | | Add smile, gaze and blink detection features CRs-fixed: 531927 587195 Change-Id: I7e710e6d9038b14d00d77ea87f9b4c65baa74fc0
* Merge "Camera: Revering changes of clear preview frame during activity pause."Linux Build Service Account2013-12-081-14/+0
|\
| * Camera: Revering changes of clear preview frame during activity pause.c_shrini2013-12-051-14/+0
| | | | | | | | | | | | | | | | | | | | | | In camera application, the preview frame is rendered on the surface texture. When user pause, this surface texture is retained by the activity. Upon user resume, it will be destroyed and recreated so that new preview frames can be rendered on it. During this period, a flickering impact is seen on UI. Change-Id: I5728d5d7f28ec45121f375928bf2c9effd9bd620 CRs-fixed: 583474
* | Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-064-42/+220
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge "Fix issue of focus indicator staying on without being hidden" into ↵Sascha Haeberling2013-11-142-17/+14
| |\ | | | | | | | | | gb-ub-photos-carlsbad
| | * Fix issue of focus indicator staying on without being hiddenSascha Haeberling2013-11-132-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11505806 A mix up in the previous 100% CL caused this. This CL here also makes it more robust by making the 100% extra time time-based instead of frame-based. Change-Id: I52c53d4b5816570c2c805e0e8ff193de684f2a64
| * | Ensure view size gets updated after phone decors change.Doris Liu2013-11-131-9/+14
| |/ | | | | | | | | Bug: 11661906 Change-Id: I63234a94b5a0bbd0cc6aa62ccd2642de09208403
| * Show the 100% state of the progress at least one frame.Sascha Haeberling2013-11-122-16/+82
| | | | | | | | | | | | Bug: 11505806 Change-Id: I5fe8456ff93cd50da53e022ac2cf2dd9ac633b2f
| * Add a null check to fix NPEztenghui2013-11-081-1/+4
| | | | | | | | | | bug: 11594111 Change-Id: Ica2ffe315c4e4eaa818aa609d9600d5e67e54b3b
| * Add logging to various actionsSeth Raphael2013-11-071-0/+3
| | | | | | | | | | | | Bug: 11514148 Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2
| * Add GCam progress indicator.Sascha Haeberling2013-11-072-13/+98
| | | | | | | | | | | | Bug: 11505806 Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820
| * Preserve high resolution image on touch during zoomDoris Liu2013-11-041-8/+11
| | | | | | | | | | Bug: 11477449 Change-Id: I08b33cee258de1f90e5fa60e6483834dd5197bd2
| * Don't call onCurrentDataChanged for CameraPreview when reloading.ztenghui2013-10-211-3/+14
| | | | | | | | | | | | | | | | In this case, camera preview didn't change, so there is no need to call onCurrentDataChanged. bug:11237255 Change-Id: I788a2ee4e7337721d0bbd6aa75e7da6d382bf282
| * Merge "Don't allow swipe into the film strip view when swipe is disabled" ↵ztenghui2013-10-171-1/+8
| |\ | | | | | | | | | into gb-ub-photos-carlsbad
| | * Don't allow swipe into the film strip view when swipe is disabledztenghui2013-10-151-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The swipe is supposed to be intercepted by FilmStripView, however, when the children is not handling the scroll / fling gestures, FilmStripView will still has to handle it. In this case, we need to detect whether or not the swipe has been disabled. bug:11234333 bug:11221594 Change-Id: I1d0fbac65050aef225fb880a41df735e98bf48db
* | | Merge "Consider layout width for pie menu arc radius"Linux Build Service Account2013-11-191-1/+8
|\ \ \
| * | | Consider layout width for pie menu arc radiusSanthosh Kumar H E2013-11-141-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pie renderer arc radius was always constant and read from resource dimensions, irrespective of the screen width. Hence when there are more options, some of the options were getting rendered beyond the screen. In this code the value from dimensions is saved to a separate variable. During each layout change maximum value which can be rendered is set as arc radius. Change-Id: I893685d0e57c839ccbb96826c01208fa581fa7cc CRs-Fixed: 568052
* | | | Camera2:Fix crash on launch of camera after deleting camera folder.Vasantha Balla2013-11-141-2/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If video starts playing from camera and suddenly camera folder is deleted from gallery, then crash is seen while launching camera. - Film strip reload is not getting called for this case and trying to access old data from data adapter which is null.Added reload function if only camera preview is present and no other camera data. CRs-Fixed: 567569 Change-Id: I9c6c7ebe63c553ccc68b985e00fa0ca722d77157
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 23:12:24 +0000