summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make the speed indicator visible.Wei-Ta Chen2011-08-173-21/+12
| | | | | | | The speed inidicator has to be drawn on top of the viewfinder/panorama preview. Its visibility state should be same to the STOP button. Change-Id: I5631dd77a98e96b2467f146f0b437e2043504fa1
* Move CameraPicker into IndicatorControl.Chung-yih Wang2011-08-1715-76/+32
| | | | | | +Move the CameraPicker icon to IndicatorBar for Phone UI. Change-Id: I2ab75166586adb6a029b4cf1b3f19604526dd818
* Fix the indicator wheel look.Chung-yih Wang2011-08-171-5/+6
| | | | | | | | Since we had a invisible zoom picker control inside the indicator wheel. The look of the indicator wheel was not correct. The change fixes the look by moving out the ZoomPicker. Change-Id: If947918f5d67e9224de44a48e7f1c28dba3e9f08
* Merge "Add Sprung Lever Zoom Control for Phone UI."Chung-yih Wang2011-08-1744-288/+901
|\
| * Add Sprung Lever Zoom Control for Phone UI.Chung-yih Wang2011-08-1744-288/+901
| | | | | | | | | | bug:5083780 Change-Id: I5b29f6bc509fc93ed74175e2754ce9f3c4afe27f
* | Fix issue: returned width/height <= 0.Angus Kong2011-08-171-0/+7
| | | | | | | | | | | | | | Width/height returned by Mosaic JNI is <= 0. generateFinalMosaic() now returns null in such cases. bug:5133740 Change-Id: I49b69cab1d40fd878d7cd4988fbc1a9f4dba9343
* | Merge "Fix NPE at PanoramaActivity.stopCapture()"Angus Kong2011-08-163-113/+75
|\ \
| * | Fix NPE at PanoramaActivity.stopCapture()Angus Kong2011-08-163-113/+75
| |/ | | | | | | | | bug: 5166705 Change-Id: Idbeeaef6981775303ebc324a0f004b6db45bcbf8
* | 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
* Merge "Show tap to focus toast after getting the first orientation."Wu-cheng Li2011-08-161-16/+31
|\
| * Show tap to focus toast after getting the first orientation.Wu-cheng Li2011-08-161-16/+31
| | | | | | | | | | bug:5039278 Change-Id: I011a8f89deedaa81d9700a01605862bed72cdeac
* | Remove preview layout and adjust widget size.Angus Kong2011-08-1610-118/+56
|/ | | | | | | | Since we now use GL to render the realtime preview, the original preview frame can be removed then. Also some widgets' size is adjusted. bug:5142002 Change-Id: I8da708bab63b107b39e9e87a4893506dec171910
* Merge "Add tap to focus toast."Wu-cheng Li2011-08-158-3/+72
|\
| * Add tap to focus toast.Wu-cheng Li2011-08-158-3/+72
| | | | | | | | | | bug:5039278 Change-Id: I1c47ffa46df7b6c1fdd447b688e1c7ccb724cb5a
* | Fix an issue with hitting frame number limit.Wei-Ta Chen2011-08-152-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | In the native side, the library always returns the transformation of the 100th frame after hitting the frame number limit - 100. The application codes need to avoid adding more frames once the limit reaches. Otherwise, we see the UI repeating the 100th on the panorama preview. Ultimately, we want this termination condition to be solely determined in the native side. Also updates a comment on MosaicRenderer. Change-Id: I6883b25f14103527de8454a2568f4768669e0aff
* | Merge "Remove the flag - mUseSurfaceTexture."Wei-Ta Chen2011-08-152-61/+14
|\ \
| * | Remove the flag - mUseSurfaceTexture.Wei-Ta Chen2011-08-122-61/+14
| | | | | | | | | | | | | | | | | | | | | The flag was used for debugging. We completed the transition of using SurfaceTexture to get preview frame data. Change-Id: I4af16456845c741342bbbf65e912a67c094ab006
* | | Merge "Import revised translations."Eric Fischer2011-08-1545-398/+200
|\ \ \ | |_|/ |/| |
| * | Import revised translations.Eric Fischer2011-08-1245-398/+200
| | | | | | | | | | | | Change-Id: Ida726d14df0828b0aba25e31b958e743b7fa0ed8
* | | Merge "Draw all the faces on one face view."Wu-cheng Li2011-08-155-132/+126
|\ \ \
| * | | Draw all the faces on one face view.Wu-cheng Li2011-08-155-132/+126
| | | | | | | | | | | | | | | | | | | | | | | | bug:4460717 Change-Id: I29b676a95d8fc7b22b359508e1886fba513ba493
* | | | Merge "Use "Start" button instead for Panorama."Angus Kong2011-08-156-61/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Use "Start" button instead for Panorama.Angus Kong2011-08-156-61/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The shutter button in panorama is replaced by a start button. bug:5141569 Change-Id: Idb3f6cc621be5b83fae70bce7ef35636079e31f3
* | | | Remove unused files.Wu-cheng Li2011-08-1527-3457/+1
|/ / / | | | | | | | | | Change-Id: I8f7c34ddb1ffa1455131c51ff7d6522f3d94e402
* | | Generate High-res panorama.Angus Kong2011-08-151-53/+45
| | | | | | | | | | | | | | | bug:5105037 Change-Id: I06a5527b9b614ff3aedf7e1b5d1efd38938dbd3d
* | | Merge "Remove focus mode setting if tap-to-focus is possible."Wu-cheng Li2011-08-141-2/+7
|\ \ \
| * | | Remove focus mode setting if tap-to-focus is possible.Wu-cheng Li2011-08-141-2/+7
| |/ / | | | | | | | | | | | | bug:5141526 Change-Id: I947721209ffbcb3eb6f443cb503f80871031a0bf
* | | Merge "Fix mode picker and setting wheel overlap on 7'' tablet."Wu-cheng Li2011-08-141-3/+2
|\ \ \
| * | | Fix mode picker and setting wheel overlap on 7'' tablet.Wu-cheng Li2011-08-141-3/+2
| |/ / | | | | | | | | | | | | bug:5155795 Change-Id: Ie7622db1db8d126c8cbf78a2b93a404a3544a82a
* | | Merge "Do not show focus rectangle if there is any face rectangle."Wu-cheng Li2011-08-142-3/+21
|\ \ \ | |_|/ |/| |
| * | Do not show focus rectangle if there is any face rectangle.Wu-cheng Li2011-08-122-3/+21
| |/ | | | | | | | | | | | | Also clear all face rectangles in stopFaceDetection. bug:4460717 Change-Id: I282376be94844c5066926c2d0749d334197df292
* | Updates to allow using SurfaceTexture for reading the preview frames ↵mbansal2011-08-1219-187/+1137
|/ | | | | | | | | | | | | | | | | | | directly from GPU memory. 1) SurfaceTexture is now used to obtain the data processed by the mosaicing library. 2) SurfaceTexture in GPU memory is directly rendered using the transformation from the mosaicing library to generate the preview mosaic. 3) GPU is also used to generate the Low-Res frames from the High-res frames (was being done in CPU before). 4) SurfaceTexture is also used to render the viewfinder as soon as the mosaicing application starts (eliminating the need for a separate SurfaceHolder to render the camera). 5) Modified the XML layout during the preview state to be the same size as during the capture stage to accommodate the SurfaceTexture based viewfinder [this needs to be reviewed and adjusted]. 6) Fixed the viewfinder and back button issues identified by Wei-Ta. 7) Round-1 of removing trailing spaces and tabs. 8) Added documentation to new Java side interfaces and cleaned up code in general. 9) Cleaned up redundant and commented out code from the native side. 10) Merged with latest updates from the main trunk. 11) Fixed issues identified in code review and also cleaned up and refactored some code. 12) Added layout-w1024dp/pano_capture.xml for tablet layout. Change-Id: If8fb0116de6c7fc6652cc67ac453553726961c32
* Remove zoom ratio text label.Wu-cheng Li2011-08-1253-152/+7
| | | | Change-Id: Ia4d54034b0b2c039e874b1fa580b036962f4cd33
* Use matrix to transform the location of faces.Wu-cheng Li2011-08-114-46/+75
| | | | | | bug:5141019 Change-Id: Id4bb82cee5fd788689fb18bb199504d963c5d3a2
* "Retake" and "Ok" buttons can function correctly.Angus Kong2011-08-117-55/+176
| | | | | | | | | | | 1. "Retake" button brings user back to preview stage without saving the final result. 2. "Ok" button brings user back to preview stage after saving the final result. bug:5031609 bug:5142100 bug:5134202 bug:5133871 Change-Id: I234e242182765cc5624b2fc8444bc38e5a9edf9f
* Merge "Remove color effects to simplify UI."Wu-cheng Li2011-08-1074-591/+2
|\
| * Remove color effects to simplify UI.Wu-cheng Li2011-08-1074-591/+2
| | | | | | | | | | bug:5141303 Change-Id: Ie6a9d0dde40c1ed1d7ec6f93f8e6e6bbc9393bf7
* | Remove some scene modes.Wu-cheng Li2011-08-1048-451/+0
|/ | | | | | | | | To simplify UI, remove some scene modes. Keep only auto, night, party, sport, and sunset. bug:5141484 Change-Id: I1c9daa17e8e147a6be42abb6611523390da906ff
* Remove share icon and close arrow.Wu-cheng Li2011-08-1010-52/+17
| | | | | | | | | | Alose increase the speed of icon rotation. bug:5141343 bug:5141404 bug:5141514 Change-Id: I0db6b6edbc0fc1a0f83b4f29f6828bcff01bf0c4
* Update face detection API.Wu-cheng Li2011-08-102-6/+4
| | | | | | bug:4460717 Change-Id: Ia748a3b9c5664058c63edce2335836f3817c909d
* Merge "Remove the unnecessary low-res alpha bitmap."Wei-Ta Chen2011-08-092-53/+13
|\
| * Remove the unnecessary low-res alpha bitmap.Wei-Ta Chen2011-08-082-53/+13
| | | | | | | | | | | | | | | | | | Since we now use OpenGL to render panorama preview in the native layer, there is no need to maintaine a low resolution alpha bitmap in the application layer for panorama preview rendering. The change improves the rendering performance. Change-Id: I3e7fa36e895d600de06808a2a67f72ae757205e2
* | Merge "Use recording hint API."Wu-cheng Li2011-08-093-6/+3
|\ \
| * | Use recording hint API.Wu-cheng Li2011-08-093-6/+3
| | | | | | | | | | | | | | | bug:4266229 Change-Id: Iafd4b6cb4bf20a1bff3ed639f9e48ca71f026969
* | | Do not show mode picker in intent modes.Wu-cheng Li2011-08-092-2/+4
|/ / | | | | | | | | bug:5107643 Change-Id: I0f8377e72e5e2b9c2947ef396afe12dda2c6c7c1
* | Fix shutter button state is not reset.Wu-cheng Li2011-08-091-9/+18
| | | | | | | | Change-Id: I80402befad3ad827efa9f1441699b72032b2b3ce
* | Use new background and shutter button.Wu-cheng Li2011-08-0972-121/+168
|/ | | | | | bug:5024054 Change-Id: I2def331433b0db66efc0d38f1e9537c0980441bb
* Merge "Import revised translations."Eric Fischer2011-08-0846-8/+96
|\
| * Import revised translations.Eric Fischer2011-08-0546-8/+96
| | | | | | | | Change-Id: I1a9186257cf70a843fcd9de1d04d39b8ba698ac8