summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/Camera.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Update focus rectangle assets."Wu-cheng Li2011-09-021-7/+7
|\
| * Update focus rectangle assets.Wu-cheng Li2011-09-011-7/+7
| | | | | | | | | | bug:5223866 Change-Id: I9e938953dd552da784fdea067a9b2b3859e579dd
* | Move review control out of preview.Chih-yu Huang2011-09-021-27/+11
| | | | | | | | | | bug:5141555 Change-Id: I04e4ca0d0e1a40ccfe39e5276fda66ffd02ae1b5
* | Add video snapshot.Wu-cheng Li2011-09-011-40/+27
|/ | | | | | | | | | | | | | Touch on the viewfinder will take a picture during recording. Things not implemented: - Add EXIF GPS. - The last thumbnail can be a jpeg in camcorder mode. - Call setRotation. - Highlight preview border during video snapshot. bug:5187868 Change-Id: I59a22aa00424355584611f095af752b83c0ee2f0
* Merge "Remove thumbnail in image and video capture intent."Chih-yu Huang2011-08-301-3/+3
|\
| * Remove thumbnail in image and video capture intent.Chih-yu Huang2011-08-301-3/+3
| | | | | | | | | | bug:5141555 Change-Id: I240006b82f6c694a1549208bcb580f393f07f2bf
* | Rotate the focus rectangle in different orientations.Wu-cheng Li2011-08-301-3/+4
|/ | | | | | | | The new focus assets look different in portrait and landscape. Rotate the drawable so the orientation looks correct. bug:5223866 Change-Id: I5e5ebbcbaca95b118e051fbf6131c1a12584b2f2
* Increase the resolution of the thumbnail.Wu-cheng Li2011-08-291-10/+8
| | | | | | | | | | | | The share popup gets bigger. The resolution of the thumbnail should be increased. This also fixes OOM in panorama. It should use the width to calculate the resolution, not height. bug:5157438 bug:5220505 Change-Id: Ib7b6600469e94e38bd684c43b07584ce61acfcca
* Decrease the time of showing postview image.Wu-cheng Li2011-08-291-2/+2
| | | | | | | | | Originally the camera shows postview for 1.2 seconds. Decrease the time so the camera does not look slow. bug:5219431 Change-Id: I01b38ee6812aacbab9bc0c9096799933be6a72d9
* Merge "Add ZoomControlWheel."Chung-yih Wang2011-08-291-57/+59
|\
| * Add ZoomControlWheel.Chung-yih Wang2011-08-291-57/+59
| | | | | | | | | | bug:5083780 Change-Id: I1a18c247d638edd3f8e5e0588170b6820f280f96
* | Make the size of the share popup the same as preview area.Wu-cheng Li2011-08-291-1/+1
|/ | | | | bug:5157438 Change-Id: Ib199ee62cce314c648c323304289af7e1421c59e
* Change front/back switcher icon in camera modeChih-yu Huang2011-08-261-0/+3
| | | | | bug:5198658 Change-Id: I4a0f91f9318313c219904c3417fbf98a256cfac3
* Fix NPE in FocusManager.Wu-cheng Li2011-08-251-3/+3
| | | | | | bug:5210804 Change-Id: I39143a3c45d27db6dc2669e3a249945aafddc3c4
* Merge "Add second-level indicators in tablet UI."Chung-yih Wang2011-08-251-25/+9
|\
| * Add second-level indicators in tablet UI.Chung-yih Wang2011-08-251-25/+9
| | | | | | | | | | | | | | | | bug:5146861 bug:5140745 +Animation for open/close. Change-Id: I8daeec1d63c23027a212fa4c363bb4beee13ef6f
* | Add thumbnail and share popup for the last result.Angus Kong2011-08-251-25/+22
|/ | | | | | bug:5141665 Change-Id: Idc44d33d09c8d4a30fdcef66de2d6754daf1ea82
* Refactor all focus code to a separate class.Wu-cheng Li2011-08-231-274/+64
| | | | | | | The code about focus is complicated and scattered around. Move the code to a new class, so it is easier to maintain. Change-Id: I0214b405bf1596d967e7d89cdb04328322c6ab95
* Use public API Parameters.FOCUS_MODE_CONTINUOUS_PICTURE.Wu-cheng Li2011-08-231-4/+1
| | | | | bug:5086125 Change-Id: I3e10e9a993804e60d77ba678c0fa664d9c13fa17
* Start face detection every time after starting preview.Wu-cheng Li2011-08-231-2/+2
| | | | | | | | | | This fix the face detection is not resumed after tap-to-focus and take a picture. According to javadoc, face detection should be restarted after starting preview. bug:4460717 Change-Id: Ic092de72e42c281c78f9e11b67df9d89c0b10388
* Merge "Add continuous autofocus in still picture mode."Wu-cheng Li2011-08-221-29/+46
|\
| * Add continuous autofocus in still picture mode.Wu-cheng Li2011-08-221-29/+46
| | | | | | | | | | bug:5086125 Change-Id: I5c235fce5f13115554849623579cc5e659521ed3
* | Add exposure indicator on screen.Chih-yu Huang2011-08-221-27/+57
|/ | | | | bug:5141528 Change-Id: Ib63c24b52c4b4bc67e88c1ec6a8ac41b9e4c09e5
* Cleanup unused imports.Chung-yih Wang2011-08-191-1/+0
| | | | Change-Id: I72c979a921d4b6a5143bd90a59e9e4d91958033f
* Merge "Clear the face view in onPause and when face detection starts."Wu-cheng Li2011-08-171-2/+6
|\
| * Clear the face view in onPause and when face detection starts.Wu-cheng Li2011-08-181-2/+6
| | | | | | | | | | | | bug:5169594 Change-Id: I822e8860861c6b11ab55bcfd5a9604e4fcee8d6a
* | Move CameraPicker into IndicatorControl.Chung-yih Wang2011-08-171-20/+0
|/ | | | | | +Move the CameraPicker icon to IndicatorBar for Phone UI. Change-Id: I2ab75166586adb6a029b4cf1b3f19604526dd818
* Merge "Add Sprung Lever Zoom Control for Phone UI."Chung-yih Wang2011-08-171-56/+35
|\
| * Add Sprung Lever Zoom Control for Phone UI.Chung-yih Wang2011-08-171-56/+35
| | | | | | | | | | bug:5083780 Change-Id: I5b29f6bc509fc93ed74175e2754ce9f3c4afe27f
* | Revert "Clear the face view in onPause and when face detection starts."Wu-cheng Li2011-08-171-3/+1
|/ | | | | | | This reverts commit 383a2b45820ff710627dbd536f1bd683e393e335. The changes will have NPE in onPause if the camera cannot be connected.
* Clear the face view in onPause and when face detection starts.Wu-cheng Li2011-08-161-1/+3
| | | | | bug:4460717 Change-Id: Ia35f525ef40a03fc5ad4bee715ad107201323f7a
* Show tap to focus toast after getting the first orientation.Wu-cheng Li2011-08-161-16/+31
| | | | | bug:5039278 Change-Id: I011a8f89deedaa81d9700a01605862bed72cdeac
* Add tap to focus toast.Wu-cheng Li2011-08-151-0/+28
| | | | | bug:5039278 Change-Id: I1c47ffa46df7b6c1fdd447b688e1c7ccb724cb5a
* Draw all the faces on one face view.Wu-cheng Li2011-08-151-12/+20
| | | | | | bug:4460717 Change-Id: I29b676a95d8fc7b22b359508e1886fba513ba493
* Do not show focus rectangle if there is any face rectangle.Wu-cheng Li2011-08-121-0/+4
| | | | | | | Also clear all face rectangles in stopFaceDetection. bug:4460717 Change-Id: I282376be94844c5066926c2d0749d334197df292
* Remove zoom ratio text label.Wu-cheng Li2011-08-121-4/+2
| | | | Change-Id: Ia4d54034b0b2c039e874b1fa580b036962f4cd33
* Use matrix to transform the location of faces.Wu-cheng Li2011-08-111-0/+2
| | | | | | bug:5141019 Change-Id: Id4bb82cee5fd788689fb18bb199504d963c5d3a2
* Remove color effects to simplify UI.Wu-cheng Li2011-08-101-12/+2
| | | | | bug:5141303 Change-Id: Ie6a9d0dde40c1ed1d7ec6f93f8e6e6bbc9393bf7
* Remove share icon and close arrow.Wu-cheng Li2011-08-101-9/+3
| | | | | | | | | | Alose increase the speed of icon rotation. bug:5141343 bug:5141404 bug:5141514 Change-Id: I0db6b6edbc0fc1a0f83b4f29f6828bcff01bf0c4
* Update face detection API.Wu-cheng Li2011-08-101-5/+3
| | | | | | bug:4460717 Change-Id: Ia748a3b9c5664058c63edce2335836f3817c909d
* Use recording hint API.Wu-cheng Li2011-08-091-2/+1
| | | | | bug:4266229 Change-Id: Iafd4b6cb4bf20a1bff3ed639f9e48ca71f026969
* Use View.GONE instead of View.INVISIBLE.Chung-yih Wang2011-08-051-5/+5
| | | | | | Refactor this to improve the performance. Change-Id: I6a20021bf07546b0cfa6b4c4b5fe0d67556940a5
* Merge "Add the CameraPicker for PhoneUI."Chung-yih Wang2011-08-051-1/+26
|\
| * Add the CameraPicker for PhoneUI.Chung-yih Wang2011-08-051-1/+26
| | | | | | | | | | | | +recover the removed CameraPicker. Change-Id: I5e45c4f73ce7c082cf420d27a86b922283a83bcc
* | Add face detection UI.Wu-cheng Li2011-08-041-12/+34
|/ | | | | bug:4460717 Change-Id: Id09cc012efffcee0f5af3a070b5dcb775a7048a0
* Merge the indicator bar implementations.Chung-yih Wang2011-08-041-177/+56
| | | | | | | | | | | | bug:5039235 Originally we have the GLView-implemented indicators for Phone-based UI. Based on the current UI design, we would like to merge the look on all devices for the dialog of the camera setting. Therefore, a refactor of how to handle the popup window is required here and this will simplify our UI work for handling different layout/resolution. Change-Id: I6f9e6ebed7600be460ddd906505cdc44f81098ad
* Set recording hint to true in camcorder mode.Wu-cheng Li2011-08-021-0/+2
| | | | | bug:4266229 Change-Id: Ic8cf3ea9e16adb62dbe30df7baf9528807c9ea56
* Add mode picker for camera/camcorder/panaramorepo sync2011-07-291-31/+23
| | | | | | | | +remove camera switcher +add menu item for panorama bug:5039225 Change-Id: Ib065074026760f7dc1bd1dfe694935f46bb8c407
* Broadcast new picture and new video intents.Wu-cheng Li2011-07-201-0/+3
| | | | | bug:4964321 Change-Id: I94edce33bd18fc67ed8220d54b01c1af63963c5c
* Merge "Make all wheel icons rotatable."repo sync2011-07-171-2/+3
|\