summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoUI.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot"Linux Build Service Account2015-02-101-1/+1
|\
| * SnapdragonCamera: Add FullScreen Preview when in Panoramic shootJay Wang2015-02-091-1/+1
| | | | | | | | | | | | | | | | | | 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
* | Merge "SnapdragonCamera: Cover the preview until the preview really starts"Linux Build Service Account2015-02-101-4/+7
|\ \
| * | SnapdragonCamera: Cover the preview until the preview really startslikaid2015-02-051-4/+7
| |/ | | | | | | | | | | | | | | | | | | When the surface was ready, the preview data may not come yet, that caused the desktop ui flashed in the camera when relaunching camera. Delay the occasion of dismissing preview cover until onPreviewStarted. Change-Id: I80b751bd19889683d784b94827b668efa817ff02 CRs-Fixed: 789076
* / SnapdragonCamera: fix preview not shown bugLikai Ding2015-02-061-0/+2
|/ | | | | | | | resizeForPreviewAspectRatio() might be called before SurfaceView's layout process, which causes SurfaceView being set to 0 width and height. Add check before adjusting SurfaceView's dimensions. Change-Id: I66bf6dfcef74253429b2c6cd1a80031d8e30f95d
* SnapdragonCamera: fix portrait orientationLikai Ding2015-02-021-16/+68
| | | | | | | | | | | | 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
* SnapdragonCamera: Sync surface destruction and camera open thread.Sai Kumar Sanagavarapu2015-01-201-1/+1
| | | | | | | | | | If surface gets destroyed while Camera open thread is still trying to start preview, camera app state machine will go into toss. Next time when surface gets created again, it might try to set preview surface again while previewing leading to app exception. So, sync surface destruction and camera open threads. Change-Id: I6ba4103559766c327d2bc55887a0f7df1b4b0d40
* Merge "SnapdragonCamera: implement refocus feature"Linux Build Service Account2015-01-181-0/+5
|\
| * SnapdragonCamera: implement refocus featureLikai Ding2015-01-141-0/+5
| | | | | | | | | | | | | | | | 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: Fix null pointer exception in SnapdragonCamerakaiyiz2015-01-151-3/+8
|/ | | | | | | | | | Null Pointer exception occurred in Camera during monkey test. Add null pointer check before use them. Change-Id: I992f6b8f8dc6b91947ec3e4d703b4e9b72996f67 CRs-Fixed: 780252
* SnapdragonCamera: support 4:3 preview on 16:9 screenLikai Ding2015-01-081-44/+95
| | | | | | | | 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-0/+9
|\
| * SnapdragonCamera: fix app crash when switch to camcorderkaiyiz2014-12-161-0/+9
| | | | | | | | | | | | | | | | | | | | Camera app crash when switch to camcorder during continuously shooting. Prohibition click event when continuously shooting. CRs-Fixed: 744811 Change-Id: Ia51ca53d46e060c2a4f4e877c37f795526532be7
* | SnapdragonCamera: show how many more pictures can be takenLikai Ding2014-12-221-0/+3
|/ | | | | | | Prompt to user an estimation of how many more pictures can be taken, calculated based on available storage. Change-Id: Iabc8268d548d3f6d86a6d065b511641b837a1de5
* SnapdragonCamera: Add back missing setting menusByunghun Jeon2014-11-191-30/+25
| | | | | | Adding back missing setting menus Change-Id: I803d3f694b1953aa6a8932cbba6bb55c0d0e6352
* SnapdragonCamera: Add preview thumbnail buttonByunghun Jeon2014-11-191-2/+22
| | | | | | Add preview thumbnail button and touch it to go to gallery Change-Id: Ib80ef94c677c204d7f0826356792aba2aa11d4d1
* SnapdragonCamera: Use MDP composition instead of GPUByunghun Jeon2014-11-171-63/+92
| | | | | | Use MDP composition instead of GPU Change-Id: I4f47d26365bd611242a21e66b232d7521b502b04
* SnapdragonCamera: Modify SnapdragonCamera UIByunghun Jeon2014-11-171-12/+175
| | | | | | Modified SnapdragonCamera setting menus with new icons Change-Id: I726296dfb100ac81ad6f1cd84420ae27c0ae1201
* Merge "Camera2: fix camera carsh when mPieRender is null"Linux Build Service Account2014-11-021-3/+6
|\
| * Camera2: fix camera carsh when mPieRender is nullkaiyiz2014-10-151-3/+6
| | | | | | | | | | | | | | | | | | | | | | The autofocus maybe called before onCameraOpened, and mPieRender is not initialize which lead to camera crash. Check null when show focus ui. CRs-Fixed: 712850 Change-Id: If3d51c8ea31f4a755e26fe4730e85428373e6446
* | Merge "Camera2: fix sawtooth in camera preview"Linux Build Service Account2014-11-021-8/+4
|\ \
| * | Camera2: fix sawtooth in camera previewLikai Ding2014-10-151-8/+4
| |/ | | | | | | | | | | | | | | | | | | Under certain combination of preview/screen resolution, sawtooth is seen on preview image. In setTransformMatrix(), scaledTextureWidth/Height is unnecessarily rounded to integers, losing precision. Removing the rounding fixes the problem. CRs-Fixed: 705322 Change-Id: Ia78b012cf530528b3677a8684279862a81b145ed
* / Camera: open Camera and start Preview in a seperate thread.Sai Kumar Sanagavarapu2014-10-201-4/+6
|/ | | | | | | | Start openCamera and start preview in a separate thread so that UI initialization and preview can run parallely. This is to improve camera cold start latency. Change-Id: I57af45bc90a4db1630c73449d543c3ff0992e55c
* 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
* Camera2: fix face still display after unmark the face detect optionkaiyiz2014-07-141-0/+8
| | | | | | | | | | | After unmark the face detect option, the value mFace in FaceView maybe reset value and draw all the time. The faces should not be draw after stopFaceDetection, so block draw the faces after stopFaceDetection and unblock after startFaceDetection. Change-Id: I2f8316e12ad8c7b157bc732800d9247c66a17572 CRs-Fixed: 692057
* Camera2: fix white balance still work when turn on the HDR modekaiyiz2014-07-031-1/+4
| | | | | | | | | | | | | | | | | | | | | Tested on target : 8916 Tested on Branch : kk Tested on AU \ tip : AU_LINUX_ANDROID_LNX.LA.3.7.1.04.04.03.031.203 Test case Verified : Yes CR Moved to Fix : Yes R notes filled : Yes DC set : Yes LOST approved (if new file \ feature added): Yes Voted on required Trunk : NA App need clear the whitebalance effect when set scene mode not auto, but the value getWhiteBalance still is not auto when change scene mode. So set white balance auto value forcely when scene mode is not auto. CRs-Fixed: 685240 Change-Id: Ib94b9cb1f3cc0c8ef63412ef75d65359ba797f37
* Merge tag 'android-4.4.3_r1' into HEADChiou-Hao Hsu2014-06-111-3/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 4.4.3 release 1 * tag 'android-4.4.3_r1': Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Remove TRIM support Import translations. DO NOT MERGE Import translations. DO NOT MERGE Fix samsung video recording Fix WB indicator override Revert fixed focus area in CAF mode Add another HTC picture resolution Always set focus mode first before applying scene mode Reduce logging of flattened Preferences Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Conflicts: res/values/arrays.xml src/com/android/camera/FocusOverlayManager.java src/com/android/camera/PhotoModule.java src/com/android/camera/VideoModule.java Change-Id: I4be00366e24933c6504639776c711e1a874d1f2e
| * Fix WB indicator overrideMichael Kolb2013-12-031-3/+6
| | | | | | | | | | | | | | | | Patching into Carlsbad from Bryce. Bug: 9372794 Change-Id: I4f23f05ca1acaef84a24034237e82001aac09f78
* | Camera2: Query support for longshot and ZSL+HDR from parameters.Sai Kumar Sanagavarapu2014-06-021-0/+4
| | | | | | | | | | | | | | | | | | | | Query camera parameters to check if longshot and ZSL+HDR are supported or not. Also, add generic way of enabling/disabling preferences to facilitate features which are mutually exclusive. Change-Id: I4332e3d5050f56b1953e4c0d767eb87f7e932c49
* | Camera: Decrease downsample factor for smaller resolutionSuman Mukherjee2014-05-141-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | After image capture, animation takes place with a downsampled image (by factor 4). Due to downsampling smaller resolution (QCIF and others) image size for animated thumbnail is going below the allocated size and it appeared very small. Fix: For image size of resolution CIF downwards, use downsampling factor as 2 without affecting performance for other resolution. Change-Id: I1098fc1a8f6fb880d5c36ebd2eaeec4415c75fe1 CRs-Fixed: 662891
* | Camera2: dismiss all popups during camera exitingGaoxiang Chen2014-04-141-2/+11
| | | | | | | | | | | | | | | | If home key is pressed when UI is showing second level popup menu, it should dismiss all popup menu, instead of back to top level menu. Change-Id: I4678ebf875833e577d610c0aba856da5eaade982 CRs-fixed: 622519
* | Camera2: Calculate UI aspect ratio based on preview sizeVladimir Petrov2014-01-301-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This reverts change If4047860. - Simply using preview size instead of picture size at all to calculate the UI aspect ratio, avoiding tricky overwriting aspect ratio. - Will fix issues when surface texture transform is calculated based sometimes on preview size ratio and sometimes on picture size ratio. CRs-Fixed: 601495 Change-Id: I8e054c9eaafc9fb54dac2bff2c67e39f0a1fe64c
* | Aspect ratio correction for landscape mode.Santhosh Kumar H E2013-12-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | In previous android versions camera application was restricted to one mode(landscape). So aspect ratio was always calculated by just dividing height by width. In recent versions camera application is not restricted to landscape mode, so application needs to calcuate aspect ratio based on mode. This change makes sure aspect ratio calculation involves preview mode. CRs-Fixed: 579079 Change-Id: Ic980e6f6a66fcf85b72d4d249844a98e66fe85ee
* | Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-061-13/+57
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Close mode menus if another control is touchedAndy Huibers2013-11-111-0/+2
| | | | | | | | | | | | Bug: 11598901 Bug: 11635865 Change-Id: I9c6237bacef9a28de1fa238e1e7378a57abfc573
| * hide preview cover on arrival of new preview data if hiddenAndy Huibers2013-11-071-2/+4
| | | | | | | | | | Bug: 11433257 Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181
| * Parallelize opening the camera with view handling in photo mode.Erin Dahlgren2013-11-071-12/+21
| | | | | | | | | | Bug: 11255097 Change-Id: I8da16a97ee46555267ae8cfee0e7940d3f53f98f
| * Fix rotation bug for animated thumbnail shown after capture.Andy Huibers2013-10-291-1/+1
| | | | | | | | | | | | Bug: 11420737 Change-Id: I55b90137b362d0b3b98aba34114537e0f6107b8c
| * Merge "Fix the mapping between preview UI and camera sensor" into ↵Doris Liu2013-10-291-2/+6
| |\ | | | | | | | | | gb-ub-photos-carlsbad
| | * Fix the mapping between preview UI and camera sensorDoris Liu2013-10-281-2/+6
| | | | | | | | | | | | | | | Bug: 11409659 Change-Id: I46ae3d7797590d59befbdc394d5304f14a212a80
| * | Update aspect ratio when preview aspect ratio changesDoris Liu2013-10-271-0/+18
| |/ | | | | | | | | Bug: 11250125 Change-Id: If4047860f056cd81bf7d74045a68f5c0b85ad067
| * Merge "Show a preview cover until real preview is ready" into ↵Doris Liu2013-10-171-0/+7
| |\ | | | | | | | | | gb-ub-photos-carlsbad
| | * Show a preview cover until real preview is readyDoris Liu2013-10-151-2/+7
| | | | | | | | | | | | | | | Bug: 11211650 Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
* | | Camera: Checking for null before creating bitmapRaghu DP2013-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | We dont get bitmap data when image is captured in raw format. So downsample of the captured image, which is bitmap will be null. Added null check for bitmap before calling createBitmap function. Change-Id: I9261218bbb27a9a7671f62fec72885eed1376912 CRs-Fixed: 573544
* | | Bring count down timer UI to front.Santhosh Kumar H E2013-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | After inflating count down timer UI it was not visible on top of the preview. This fix will bring it to forground. Change-Id: I3fd5cf75fdd9dc63776fa68668f3b6fddf2db1f7 (cherry picked from commit 48226bb2faf6377a5af91db82ffb86848a7600bf) (cherry picked from commit c88dcd24d06a3af1de4ec18914fbb03a5678bff2)
* | | Camera: Fix for stretched preview in camera and camcorder...Santhosh Kumar H E2013-10-311-10/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stretched preview is observed in front camera due to sensor's mount angle. So resizing the preview by considering aspect ratio of the preview. (cherry picked from commit Ie8a9e062782aa6caaa80ddab705c937da6b0761e) Change-Id: I0bca9076a6dffa4c4972e6d5d0939c57569615bd Conflicts: src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java Conflicts: src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java (cherry picked from commit 2960ef94825458dc07a497d4414155b57ae620d7) (cherry picked from commit d2fbed622a486151a656261d0dd56c896f0cc700)
* | | camera: Invoke camera UI functions only after initialization.Alok Kediya2013-10-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When switching from Panorama mode to Camera mode, the CameraActivity invokes two functions openModule and onOrientationChanged. openModule initializes PhotoModule. As part of the PhotoModule initialization, the PhotoUI and PhotoMenu are initialized. But this is acheived by posting a message to the handler. When the message is read by the Handler, the PhotoUI's onCameraOpen is invoked which initializes the PhotoMenu. But sometimes before this message is read by the Handler, the onOrientationChanged is invoked, which invokes couple of functions from PhotoUI class acting on the PhotoMenu. But since the PhotoMenu is still not initialized, it throws up error in the form of NullPointerExceptions. Fix this by checking if the PhotoUI and PhotoMenu have been initialized. If they have not yet been initialized, send a message to the Handler to invoke these PhotoUI functionalities after the PhotoUI has been initialized completely. (cherrypicked from commit 774659c9f580b90a15a896881376075bb1506a05 ) Change-Id: Idb55e4f5ba29523c273ff66f11149ff271c490a4 (cherry picked from commit 42f1ffca2e43c4561f5bc3534a966c4bbe6cbef8) (cherry picked from commit 8df298b693932da2c06dbfd40ad5bbe57dc96308)
* | | Camera: Menu & zoom options are overlapping in front camera.Alok Kediya2013-10-311-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | When user presses the menuoptions the popup is displayed and UI will have the controll over it, again when zoom is triggered the zoom renderer was not hiding the menu popup. This change will synchronise both listeners mentioned above. (cherrypicked from commit 713847197c35409f0f198903f6b3dd3c39296848 ) Change-Id: Ic4509fe4473070c73dba377c5fdc3f224af71ee0 (cherry picked from commit 6c464f1402110b1f0f9790d5a9479dc3031d04eb) (cherry picked from commit 4fe74b8ad31a6d43c179e0181813ba3bf4c58feb) (cherry picked from commit e525f04730668369f76afb41870199eaad0b9375)
* | Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbadDoris Liu2013-10-161-2/+1
|\ \
| * | Fix shutter covering pie menuDoris Liu2013-10-161-2/+1
| |/ | | | | | | | | Bug: 11247988 Change-Id: I2018075a0b8adf7cacb302774ed64df92fc2fa7c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 06:40:55 +0000