summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
Commit message (Collapse)AuthorAgeFilesLines
...
* | | am 6bfe6df5: Improve the launch time.Chung-yih Wang2011-10-141-46/+80
|\ \ \ | | |/ | |/| | | | | | | * commit '6bfe6df5ea40684d56f4736da76b5680515f05ae': Improve the launch time.
| * | Improve the launch time.Chung-yih Wang2011-10-141-46/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5446617 Since there are two major blocking operations(openCamera and startPreview) which are dependent and time-consuming, we have to take advantage of this blocking intervals to do the layout inflation(setContentView) and indicator initialization concurrently to reduce the launch time. Change-Id: Ibbc3563ad3e8ccea409f61a5af9a8bdae0352579
* | | Change low storage threshold in video to 50MB.Chih-yu Huang2011-10-141-13/+7
| | | | | | | | | | | | | | | bug:5334604 Change-Id: Iefc6a20ace2c7afbbc2cb7b3acf5ac957b4f16be
* | | Merge "Change low storage threshold to 50MB."Chih-yu Huang2011-10-142-2/+8
|\ \ \
| * | | Change low storage threshold to 50MB.Chih-yu Huang2011-10-142-2/+8
| | | | | | | | | | | | | | | | | | | | bug:5334604 Change-Id: I410bcf7322c71d1ca25d3de36d574616411b5533
* | | | Rename function "setDegree" to "setOrientation".Chih-yu Huang2011-10-1414-67/+54
|/ / / | | | | | | | | | | | | bug:5244256 Change-Id: I6f5c96a5e1fefab5fa09a12fd3a0cf169bcbc6f5
* | | am 6baaa42a: Merge "Play a sound when starting and stopping recording with ↵Eino-Ville Talvala2011-10-132-1/+45
|\ \ \ | |/ / | | | | | | | | | | | | | | | effects." into ics-mr0 * commit '6baaa42a5bb88fdae55efa8dc6b7805b187f1d02': Play a sound when starting and stopping recording with effects.
| * | Merge "Play a sound when starting and stopping recording with effects." into ↵Eino-Ville Talvala2011-10-132-1/+45
| |\ \ | | | | | | | | | | | | ics-mr0
| | * | Play a sound when starting and stopping recording with effects.Eino-Ville Talvala2011-10-112-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally, CameraService takes care of this, but with the effects recording, CameraService doesn't know when recording is toggled on and off. Mirrors the code in CameraService.cpp in terms of enforcing audio output. Bug: 5383166 Change-Id: I2175c1090ff57884d17cb422532a7930f29e10de
* | | | am 3069cb81: Merge "Add video stabilization management to the application." ↵Eino-Ville Talvala2011-10-133-2/+34
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '3069cb81151aa984cab6ba8cc2d944b43099efba': Add video stabilization management to the application.
| * | | Merge "Add video stabilization management to the application." into ics-mr0Eino-Ville Talvala2011-10-133-2/+34
| |\ \ \
| | * | | Add video stabilization management to the application.Eino-Ville Talvala2011-10-123-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Still image mode: Disable vstab if it is supported - Camcorder mode: Enable vstab if it is supported - Camcorder with effects: Disable vstab when using background replacement, enable otherwise Bug: 5440224 Change-Id: Ibb9744b601d9bb122618e5eeaec00f50ee54cbee
* | | | | am 1bca5eaa: Simplify code about ShutterButton.Wu-cheng Li2011-10-134-89/+66
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '1bca5eaaa3c6d3fd36df572546715e4e515cf9e6': Simplify code about ShutterButton.
| * | | | Simplify code about ShutterButton.Wu-cheng Li2011-10-134-89/+66
| | | | | | | | | | | | | | | | | | | | | | | | | bug:5447399 Change-Id: I240d7523509f27d333a0ef69e6e0d3228a41e9de
* | | | | am 73ab0023: Implemented full scan AF followed by capture on long pressing ↵heech.park2011-10-133-11/+58
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | the shutter button. * commit '73ab0023b4a9d86ac5fa844116a83aa6c52acf0c': Implemented full scan AF followed by capture on long pressing the shutter button.
| * | | | Implemented full scan AF followed by capture on long pressing the shutter ↵heech.park2011-10-133-11/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | button. 1. In CAF, do full scan AF followed by capture on long pressing the shutter button. 2. Capture is triggered only if long press is released on the button. bug:5447399 Change-Id: I9c7d75d76074e2e20d1f1926388315cec2c22eed Signed-off-by: Raji Reddy Kandi <rajireddy.k@samsung.com> Signed-off-by: Sam Braganza <sam.braganza@samsung.com> Signed-off-by: heech.park <heech.park@samsung.com> Signed-off-by: heech.park <heech.park@samsung.com>
* | | | | am ac65f661: Merge "The orientations use right angles in Panorama." into ics-mr0Angus Kong2011-10-121-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ac65f66171c9ff18b2c9f24fd4deae64ccf6fc93': The orientations use right angles in Panorama.
| * | | | Merge "The orientations use right angles in Panorama." into ics-mr0Angus Kong2011-10-121-5/+5
| |\ \ \ \
| | * | | | The orientations use right angles in Panorama.Angus Kong2011-10-121-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original orientation is represented in 0, 1, 2, and 3. Now we use the right angles to ensure the consistency with Camera.java and VideoCamera.java. bug:5447850 Change-Id: I4bc97d4f5b76c8ae297da550b5097b38bd0cefea
* | | | | | am ef011a1e: Cancel the mosaic computation when paused.Angus Kong2011-10-121-3/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'ef011a1e479f8e801318eba2dccb50fac1590d3c': Cancel the mosaic computation when paused.
| * | | | | Cancel the mosaic computation when paused.Angus Kong2011-10-131-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5447804 Change-Id: Id8e3a9d0c140b572fa76cbe9cfb38abc6b53d871
* | | | | | am bb6fcb0f: Merge "Handle MediaRecorder stop exception for effects ↵Pannag Sanketi2011-10-121-0/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recording" into ics-mr0 * commit 'bb6fcb0f4d2a694b0d9af472d7444c653592a99e': Handle MediaRecorder stop exception for effects recording
| * | | | | Merge "Handle MediaRecorder stop exception for effects recording" into ics-mr0Pannag Sanketi2011-10-121-0/+6
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Handle MediaRecorder stop exception for effects recordingPannag Sanketi2011-10-121-0/+6
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When recording videos with the effects ON, if user starts and stops the video in rapid succession, MediaRecorder stop can throw an exception, which we want to be treated separately than other runtime exceptions thrown by effectsrecorder. In this particular case, the idea is to keep the app running without crashing. Currently, all "Stop" exceptions will lead to the same behavior. In future, we might need to work out the details more to find out what caused the stop to crash and pass that up from the native layer and react according to the cause of the exception. Change-Id: I35a961d6cf4fc3cc3ca66870ea80ee16316f0728
* | | | | Merge "bugfix 5422126 Panorama needs to load the thumbnail from the file"Mark Wagner2011-10-121-6/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | bugfix 5422126 Panorama needs to load the thumbnail from the fileMark Wagner2011-10-121-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes Panorama closer to Camera in the way the Thumbnail is loaded. But the Camera has a pretty different startup sequence so you should review this to make sure it's correct. Note that doing any IO on the UI thread can lead to ANR so we should consider making the thumbnail load from an async task instead. NOTES: In camera the sequence is like this: Thumbnail.loadFrom initThumbnailButton initializeFirstTime FIRST_TIME_INIT message onResume, surfaceChanged, So we initiate the call to Thumbnail.loadFrom via onResume or surfaceChanged. I removed the call to "updateThumbnailButton" from onStart to make this closer to what we do in Camera. Change-Id: I86283acbc9355f077d2966a018a3b972efe1c08c
* | | | | Merge "Clearing Time Lapse string on Preview screen when Restore option ↵Wei Huang2011-10-121-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | selected" into ics-mr0
| * | | | | Clearing Time Lapse string on Preview screen when Restore option selectedRaji Reddy Kandi2011-10-121-1/+4
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Steps:Camcorder->select timelapse interval->select effect->Restore Defaults. issue: Time lapse string is stil shown on preview screen. bug:5447893 Change-Id: Ia579cb74dc8ea9f53231cc42dd4c209bf0fc7b14 Signed-off-by: Padmanaban R <padhu.r@samsung.com> Signed-off-by: Raji Reddy Kandi <rajireddy.k@samsung.com>
* | | | | Do not call cancelAutoFocus after stopPreview. (do not merge)Wu-cheng Li2011-10-121-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | API did not define if cancelAutoFocus is allowed after stopPreview. Work-around this before there is a conclusion. bug:5397951 Change-Id: I5a23f02ac646b3f2a070d0d06847de3899484a72
* | | | More bg training polish.Evan Millar2011-10-111-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make training modal by placing a semi-transparent view behind the message panel to prevent interaction with the rest of the camera UI. Use the framework dialog asset as the background asset for the message panel. Since this asset is not public I had to copy it into the Camera package. bug:5225962 Change-Id: Ief97f545c6c0bb3695a056481d5e6d56d44edf25
* | | | [DO NOT MERGE] Add orientation switching and cancel button to bg training panel.Evan Millar2011-10-112-8/+24
| |/ / |/| | | | | | | | | | | | | | | | | | | | -I also changed some calls to GridView.ClearChoices() to explicit setItemChecked(..., false) calls because of bug 5439410. bug:5225962 Change-Id: Ie764a209bc9647db8522efd38609c8ed383b5d0b
* | | Merge "Remove redundant operations for zoom control."Chung-yih Wang2011-10-112-25/+27
|\ \ \
| * | | Remove redundant operations for zoom control.Chung-yih Wang2011-10-112-25/+27
| | | | | | | | | | | | | | | | | | | | bug:5441257 Change-Id: I660a8fb4edc81134a611597f46a95e7e23dabbcd
* | | | Merge "Fix 5429468: Append _1, _2, etc to the file name in the same second."Chih-Chung Chang2011-10-111-6/+37
|\ \ \ \ | |/ / / |/| | |
| * | | Fix 5429468: Append _1, _2, etc to the file name in the same second.Chih-Chung Chang2011-10-111-6/+37
| |/ / | | | | | | | | | Change-Id: I68ca915eee4e343fa1b90fef068fecb9c919aa53
* | | Add content descirptions for accessibility.Chung-yih Wang2011-10-118-7/+65
|/ / | | | | | | | | | | bug:5230109 Change-Id: I055fccea0d30c54dc8520bf1d0424b963d2ba8a5
* | bugfix 5290450 Share UI should match redlinesMark Wagner2011-10-101-0/+7
| | | | | | | | | | | | | | | | Add the "go to gallery" button at the top of the list of share choices. Made it a separate button rather than part of the list since it gets it's own separator. Change-Id: I62f866f7aedd3e84916eccf037f3fa37a8528196
* | Merge "bugfix 5290450 Share UI should match redlines"Mark Wagner2011-10-072-26/+112
|\ \
| * | bugfix 5290450 Share UI should match redlinesMark Wagner2011-10-072-26/+112
| | | | | | | | | | | | | | | | | | | | | Incremental work towards matching the redline. This will probably require a review pass from UX to catch any missed items. Change-Id: I0496aa0fc1941f8ffa06050ae8fbed3fe7246878
* | | Remember the snapshot request when the previous one is still in progress.Chih-Chung Chang2011-10-072-1/+26
| | | | | | | | | | | | Change-Id: I6916f775c1143a87c326e5450dfbdaf3008bc3b7
* | | Merge "Let review icons rotatable."Chih-yu Huang2011-10-075-9/+55
|\ \ \
| * | | Let review icons rotatable.Chih-yu Huang2011-10-075-9/+55
| |/ / | | | | | | | | | | | | bug:5244256 Change-Id: Ieed6119f22598a34eeb1672d07f55a876dced791
* | | Merge "Do not restart preview if only the size of the surface changes."Wu-cheng Li2011-10-071-22/+24
|\ \ \
| * | | Do not restart preview if only the size of the surface changes.Wu-cheng Li2011-10-071-22/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This speeds up the below case: 1. Start camera app. 2. Power off the screen. 3. Power on the screen. 4. Slide the center to the left to start camera. The camera app is already started behind the lock screen. When the lock screen closes, the camera app now just call setDisplayOrientation again. Camcorder app is more complicated because it has effects. bug:5422679 Change-Id: I26d89c97edefe7f46d0ae51759ff791ea43c7cac
* | | Merge "Allow user to adjust the focus and shutter sound volume."Chih-Chung Chang2011-10-072-1/+9
|\ \ \
| * | | Allow user to adjust the focus and shutter sound volume.Chih-Chung Chang2011-10-072-1/+9
| |/ / | | | | | | | | | | | | | | | | | | This also fix the problem that user need to slience the ringer to silence the focus/shutter sound. Change-Id: Ia4ae5feb4926172fd8af7dc4023525f2ab7daa0e
* | | Fix 5371242: Reduce shot-to-shot time by moving image saving to another thread.Chih-Chung Chang2011-10-071-34/+81
|/ / | | | | | | | | | | This is a follow-up change to add more comments and limit the queue length. Change-Id: I1aded7a87be2657a6527d924d188fb3f479ca87a
* | Merge "Properly mirror video for front camera effects recording."Eino-Ville Talvala2011-10-062-1/+46
|\ \
| * | Properly mirror video for front camera effects recording.Eino-Ville Talvala2011-10-052-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Incoming transform from camera SurfaceTexture is mirrored for front camera - Recording preview needs to be mirrored, but the recorded video needs to be unmirrored. Bug: 5408479 Change-Id: I0cdb29151ae20b02f690fb976e5a29e594c094a1
* | | Merge "WIP: Speed up shot-to-shot time by moving image saving to another ↵Wei Huang2011-10-061-15/+140
|\ \ \ | | | | | | | | | | | | thread."