summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 4d55cb36 to eclair-mr2Owen Lin2009-11-161-1/+7
|\
| * Hide the indicator if the icon is empty.Cheng-Ru Lin2009-11-121-1/+7
* | am cc12a303: Add icon-indicators to VideoCamera.Cheng-Ru Lin2009-11-111-1/+16
|\ \ | |/
| * Add icon-indicators to VideoCamera.Cheng-Ru Lin2009-11-121-1/+16
* | am 9324f11a: Add postview callback to know when the captured image is shown. ...Wu-cheng Li2009-11-111-17/+40
|\ \ | |/
| * Add postview callback to know when the captured image is shown. b2237074Wu-cheng Li2009-11-121-17/+40
* | Remove some more unused code.Owen Lin2009-11-109-19/+7
* | Merge change I85381f1e into eclair-mr2Android (Google) Code Review2009-11-091-1/+8
|\ \
| * | Add a check for the case that the camera is reopened again.Owen Lin2009-11-101-1/+8
* | | am 01ed85fb: Merge change Ic823abd0 into eclairChih-Chung Chang2009-11-092-2/+40
|\ \ \ | |/ / |/| / | |/
| * Fix 2241232: Read system properties for quality setting.Chih-Chung Chang2009-11-092-2/+40
| * DO NOT MERGE TO MR2. Fix the focus settings is incorrect when switch back to ...Owen Lin2009-11-051-24/+27
* | am 05d20c0c: Improve 2237074: Make preview start earlier.Chih-Chung Chang2009-11-052-10/+16
|\ \ | |/
| * Improve 2237074: Make preview start earlier.Chih-Chung Chang2009-11-042-10/+16
* | Remove some more code.Owen Lin2009-11-0413-1539/+6
* | Fix 2225024: Handle the case where the sd card is unmounted while recording.Chih-Chung Chang2009-11-041-3/+11
* | Fix 2232894: doesn't generate thumbnails on pressing thumbnails button, while...Chih-Chung Chang2009-11-031-2/+5
* | Clean up and add comments for classes.Chih-Chung Chang2009-11-0322-76/+121
* | Clean up and add comments for classes.Chih-Chung Chang2009-11-0215-21/+92
* | Remove unused code.Chih-Chung Chang2009-11-0214-24/+0
* | am 2c854bb9: Fix the bug that wrong zoom value is set in takePicture.Wu-cheng Li2009-10-301-0/+3
|\ \ | |/
| * Fix the bug that wrong zoom value is set in takePicture.Wu-cheng Li2009-10-301-0/+3
* | Merge change Ia4e7b972 into eclair-mr2Android (Google) Code Review2009-10-303-140/+1
|\ \
| * | remove unused resource files and elementsOwen Lin2009-10-293-140/+1
* | | Merge change I7b25fde1 into eclair-mr2Android (Google) Code Review2009-10-3029-5830/+127
|\ \ \ | |/ /
| * | Remove unused code in Camera app.Owen Lin2009-10-2929-5830/+127
* | | am 9c0f684c: Lift the upperbound of initial up-scaling.Cheng-Ru Lin2009-10-291-3/+3
|\ \ \ | | |/ | |/|
| * | Lift the upperbound of initial up-scaling.Cheng-Ru Lin2009-10-291-3/+3
* | | am 316af30d: Use zoom api. b2060030Wu-cheng Li2009-10-261-57/+49
|\ \ \ | |/ / | | / | |/ |/|
| * Use zoom api. b2060030Wu-cheng Li2009-10-221-57/+49
* | am da460876: Chagne CropImage invocation to non-explicit.Cheng-Ru Lin2009-10-222-6/+6
|\ \ | |/
| * Chagne CropImage invocation to non-explicit.Cheng-Ru Lin2009-10-212-6/+6
* | am 22a695f8: Fix the bug that one-item only settings still shown on menu.Owen Lin2009-10-201-1/+1
|\ \ | |/
| * Fix the bug that one-item only settings still shown on menu.Owen Lin2009-10-201-1/+1
* | Merge change I58068fd6 into eclair-mr2Android (Google) Code Review2009-10-191-6/+8
|\ \
| * | Fix 2192954: Camera/camcorder switch status is wrong.Chih-Chung Chang2009-10-191-6/+8
* | | Merge change I95bd9eb0 into eclair-mr2Android (Google) Code Review2009-10-191-2/+6
|\ \ \ | |/ /
| * | Fix 2186855: NPE in ViewImage.setImage.Chih-Chung Chang2009-10-191-2/+6
* | | Fix the focus settings is incorrect when switch back to auto scene mode.Owen Lin2009-10-191-24/+27
|/ /
* | Fix 2185267 and 2177765: NPE after onPause.Chih-Chung Chang2009-10-143-0/+8
* | Clear task stack when launch camera with the hardware button.Cheng-Ru Lin2009-10-141-4/+3
* | Fix 2150734.Chih-Chung Chang2009-10-141-3/+21
* | Fix 2182549: Disable search button when using camera.Chih-Chung Chang2009-10-1413-12/+38
* | am d10dda27: Fix the layout of title in Gallery-Picker.Owen Lin2009-10-131-0/+5
|\ \ | |/
| * Fix the layout of title in Gallery-Picker.Owen Lin2009-10-131-0/+5
* | Merge change Ic04ffcd9 into eclair-mr2Android (Google) Code Review2009-10-091-0/+1
|\ \
| * | Fix 2177752: NPE in onShareMultipleClicked.Chih-Chung Chang2009-10-091-0/+1
* | | Fix 2172458: NPE in getCurrentUri.Chih-Chung Chang2009-10-091-0/+1
* | | Fix 2172926: Remove unnecessary invalidate to speed up video recording.Chih-Chung Chang2009-10-091-7/+0
|/ /
* | Show flash-off indicator on the view-finder.Owen Lin2009-10-061-1/+4