summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated overflow menu in CameraJustin Ho2011-09-286-0/+0
| | | | | | Bug: 5388009 Change-Id: I536278365120e15ab0caacb09d1101f1610bad0c
* Import revised translations. DO NOT MERGEEric Fischer2011-09-2642-253/+127
| | | | Change-Id: I45dcae0b8d3985dd5e00603e440a8b6d49be654d
* Merge "Fix the bug that local preference is not reset." into ics-factoryromWei Huang2011-09-262-25/+9
|\
| * Fix the bug that local preference is not reset.Angus Kong2011-09-262-25/+9
| | | | | | | | | | bug:5366049 Change-Id: Ifee52c43c7c2ec8ff674fca8ce7762cc489c1b6a
* | Merge "Call cancelAutoFocus in startPreview and before release." into ↵Wei Huang2011-09-261-0/+6
|\ \ | | | | | | | | | ics-factoryrom
| * | Call cancelAutoFocus in startPreview and before release.Wu-cheng Li2011-09-261-0/+6
| |/ | | | | | | | | | | | | | | | | | | | | Now camera API specifies focus it not reset by stopPreview or takePicture. This is especially important when the mode is FOCUS_MODE_CONTINUOUS_PICTURE because the focus will be paused after autoFocus is called. bug:5356404 Change-Id: I027df2b8b4092183668c21f4d97a84ad73a9d396
* | Do not use black background in share UI.Wu-cheng Li2011-09-262-3/+3
|/ | | | | | | | - Add back 8dp padding. - Change background to 85% opacity. bug:5290450 Change-Id: I0dce998769391d27699aec69717ef9c11bce4534
* Merge "Import revised translations. DO NOT MERGE" into ics-factoryromEric Fischer2011-09-2346-229/+301
|\
| * Import revised translations. DO NOT MERGEEric Fischer2011-09-2346-229/+301
| | | | | | | | Change-Id: I38b286ffb4b03cba5716d7bf9ed6ef5cbc29ce80
* | Restrict effects to 480p.Eino-Ville Talvala2011-09-233-54/+116
|/ | | | | | | | - Preview stretching still occurs after some transitions. - Correct quality used in recording, shown in UI at all times. Bug: 5320425 Change-Id: I63612c55d2e6e0e979208c59f2caf9a61ac1d3f8
* Merge "Add clear effects button, silly faces title, and background title." ↵Wei Huang2011-09-2312-23/+294
|\ | | | | | | into ics-factoryrom
| * Add clear effects button, silly faces title, and background title.Wu-cheng Li2011-09-2312-23/+294
| | | | | | | | | | | | bug:5226051 Change-Id: I61609e31fb8f18041f6885cb923507aeecfd9c9f
* | Merge "Show the real resolution for quality settings." into ics-factoryromWei Huang2011-09-2325-152/+79
|\ \
| * | Show the real resolution for quality settings.Angus Kong2011-09-2325-153/+80
| |/ | | | | | | | | | | | | | | | | | | 1. Change the assets. 2. Change the strings from high/low/mms to 1080p/720p/480p. 3. Change the preference from customized string to the real values of CamcorderProfile.QUALITY_[1080|720|480]P bug:5141068 Change-Id: I294799bda8e873f828bbf4bd21330591f0859632
* | Merge "Clear zoom listener and error callback when leaving." into ics-factoryromWei Huang2011-09-232-1/+4
|\ \ | |/ |/|
| * Clear zoom listener and error callback when leaving.Chih-yu Huang2011-09-232-1/+4
| | | | | | | | | | bug:5336037 Change-Id: Ib1ffb7694625d63161e2cc52a7d755614d4b63bb
* | Merge "Fix the current mode hightlight of ModePicker." into ics-factoryromChung-yih Wang2011-09-231-10/+1
|\ \
| * | Fix the current mode hightlight of ModePicker.Chung-yih Wang2011-09-231-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5363212 The hightlight was incorrect as the initial value of ModePicker is MODE_CAMERA and the old code just return right away without update its current highlight. Change-Id: I2ae8e2c614be75836ad49abe0c735f01f37f5e12
* | | Merge "Show the hightlight bar of the active indicator button." into ↵Chung-yih Wang2011-09-235-107/+91
|\ \ \ | | | | | | | | | | | | ics-factoryrom
| * | | Show the hightlight bar of the active indicator button.Chung-yih Wang2011-09-235-107/+91
| | |/ | |/| | | | | | | | | | bug:5039235 Change-Id: I79d4b7be080748b2715b8826924de65e0d75ef39
* | | Merge "Fix setParameters failure if users keep pressing shutter." into ↵Wu-cheng Li2011-09-231-1/+1
|\ \ \ | |_|/ |/| | | | | ics-factoryrom
| * | Fix setParameters failure if users keep pressing shutter.Wu-cheng Li2011-09-231-1/+1
| |/ | | | | | | | | | | | | | | | | Do not call setParameters, autoFocus, or cancelAutoFocus if the snapshot is in progress. bug:5359430 Change-Id: I17a367643c85e0e65b2ba3f9c1ab9ace86c52722
* | Fix bugs about review control in video intent mode.Chih-yu Huang2011-09-235-26/+25
|/ | | | | | | | | - Switch position of checkmark and X. - Let review play icon visible in intent mode. - Let review control visible after reviewing video. bug:5244256 Change-Id: I20d51faf9fb5658ee009dd45ff112947cf4ebf02
* Updates to handle textureless scenes during capture.mbansal2011-09-229-58/+174
| | | | | | | | | | 1) Starts stitching only when the camera sees a textured scene at the beginning. 2) If a texturess scene is encountered in the middle of a capture, the stitching continues with the intermediate frames translated using the pan velocity estimate. 3) Added more error codes and percolated them up to the java layer. 4) Fix a build error in Mosaic::addFrame() and added comments. 5) Update the javadoc in Mosaic.java to reflect the new returning codes. Change-Id: I7727ace615ece22adefe313a19ac2cbe8c8d21a8
* Merge "Change dialog style to fit ICS theme." into ics-factoryromAngus Kong2011-09-2214-22/+38
|\
| * Change dialog style to fit ICS theme.Angus Kong2011-09-2214-22/+38
| | | | | | | | | | | | | | | | | | | | | | 1. The height of title is adjusted. 2. The height of each row is adjusted. 3. The background is not transparent anymore. 4. Font size is adjusted. 5. Leave some space between the setting popup and the indicator bar. bug:5039235 Change-Id: I22d49ea04db15b3e2a095a5e360a76ab15e1a5fc
* | Merge "Lock AE and AWB before autofocus starts." into ics-factoryromWu-cheng Li2011-09-221-0/+17
|\ \ | |/ |/|
| * Lock AE and AWB before autofocus starts.Wu-cheng Li2011-09-221-0/+17
| | | | | | | | | | | | | | | | | | | | Now camera API specifies autofocus does not lock AE and AWB. So the application locks AE/AWB when focus starts. AE/AWB are unlocked when focus finishes or preview starts. bug:5356404 Change-Id: I9d735404babd5bc84bef5253768221fd7509afca
* | Merge "Fix the zoom control bar UI on phone." into ics-factoryromChung-yih Wang2011-09-2134-38/+122
|\ \ | |/ |/|
| * Fix the zoom control bar UI on phone.Chung-yih Wang2011-09-2234-38/+122
| | | | | | | | | | | | | | +use drawable selector to activate/deactivate the zoom control bar +update/add zoom assets Change-Id: Ie429dd0d78c562c8d1045280f336ae74ea6ce898
* | Merge "Disallow video snapshot while using effects in recording." into ↵Eino-Ville Talvala2011-09-211-1/+2
|\ \ | | | | | | | | | ics-factoryrom
| * | Disallow video snapshot while using effects in recording.Eino-Ville Talvala2011-09-211-1/+2
| | | | | | | | | | | | | | | Bug: 5350124 Change-Id: I515f7982072987e888408f8d667a6a8cd422104b
* | | Bug fixes to the cropping region selection algorithm.mbansal2011-09-211-29/+18
| |/ |/| | | | | | | | | | | | | 1) The library should now return proper error code for the negative width scenario. 2) Also fixed a round-off issue which lead to improper cropping behavior for low-res output. Bug: 5330440, 5350580 Change-Id: I010be9b8a2b1252c1d2e0528956e512126f6246a
* | Merge "Correct the YUV444 to NV21 conversion." into ics-factoryromWei-Ta Chen2011-09-211-1/+1
|\ \ | |/ |/|
| * Correct the YUV444 to NV21 conversion.Wei-Ta Chen2011-09-201-1/+1
| | | | | | | | | | | | | | For the downsampling, we should use the same pixel's UV channel, instead of even pixel's V and odd pixel's U. Change-Id: If94ac380b77dc776d61fdab3a31697f9fadfbad1
* | Merge "Effects: Fix SurfaceTexture abandon/disconnect errors." into ↵Eino-Ville Talvala2011-09-211-12/+35
|\ \ | | | | | | | | | ics-factoryrom
| * | Effects: Fix SurfaceTexture abandon/disconnect errors.Eino-Ville Talvala2011-09-201-12/+35
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Now ensures that camera preview is stopped before starting or stopping the effects processing, and that the previewTexture is set to null. - Fix a few potential race conditions relating to effect switching - Tear down old graphs properly This fixes errors relating to SurfaceTexture disconnect/abandon errors when swapping between effects, and possibly some rarely-occuring race condition crashes. Bug: 5328760 Change-Id: I6b655f32b835e7ac65cb7c8dc533befb5177907c
* | Fix overridden settings don't stay disabled when resuming Camera.Wu-cheng Li2011-09-212-5/+2
| | | | | | | | | | bug:5340674 Change-Id: Iedb4bdf22cad562a8406739a1d07a758db5d9fc4
* | Merge "Show the video quality setting only when needed." into ics-factoryromAngus Kong2011-09-212-4/+3
|\ \
| * | Show the video quality setting only when needed.Angus Kong2011-09-212-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | 1. Remove mms option from quality setting. 2. Hide the quality preference when the desired quality is already known. bug:5141068 Change-Id: I3d839bc60fc6173626d0dfb4110edb06db4bf28e
* | | Change video effect setting to a grid view.Wu-cheng Li2011-09-219-13/+121
|/ / | | | | | | | | | | bug:5226051 Change-Id: If3c6aece533a263411f55d21a9cc76282b021554
* | Merge "Import revised translations. DO NOT MERGE" into ics-factoryromEric Fischer2011-09-2040-382/+192
|\ \
| * | Import revised translations. DO NOT MERGEEric Fischer2011-09-2040-382/+192
| | | | | | | | | | | | Change-Id: If540d37c7071b8e46355769b9aa051c90b943e05
* | | Blending algorithm updates to support WIDE strip-based blending.mbansal2011-09-208-18/+259
| |/ |/| | | | | | | | | | | 1) Added algorithm to select wider strips (and made it the default mode in the app). 2) Added algorithm to cross-fade blend between the wider strips. Change-Id: I744e69edb16a20f0040ee82c3390548b78853087
* | Merge "New zoom control for phone." into ics-factoryromWei Huang2011-09-2030-137/+156
|\ \ | |/ |/|
| * New zoom control for phone.Chung-yih Wang2011-09-2030-137/+156
| | | | | | | | | | | | | | | | bug:5318964 +update assets Change-Id: I39c6575803d22ab5db5c75a2d47257d12a397255
* | Merge "'Cancel' use plain text (do not merge)." into ics-factoryromWei Huang2011-09-201-1/+2
|\ \ | |/ |/|
| * 'Cancel' use plain text (do not merge).Angus Kong2011-09-201-1/+2
| | | | | | | | | | | | This was originally submitted to the master branch. Change-Id: Icb3ffcbe230f9ea83c983babd32c034261d8f478
* | Add icons for goofy faces and background replacement.Wu-cheng Li2011-09-2036-2/+17
|/ | | | | bug:5226051 Change-Id: I5758a5e8aaa0f12bc06b63b99d9c6ed2b42d507d
* Merge "Follow UI redlines for indicator bars." into ics-factoryromChung-yih Wang2011-09-204-24/+72
|\
generated by cgit v1.1 at 2025-01-09 14:24:32 +0000