summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fix 2232894: doesn't generate thumbnails on pressing thumbnails button, ↵Chih-Chung Chang2009-11-031-2/+5
| | | | | | | | while recording video
* | 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
|\ \ | |/ | | | | | | | | | | Merge commit '2c854bb917480b69630c9ab01aa9247df57a564a' into eclair-mr2 * commit '2c854bb917480b69630c9ab01aa9247df57a564a': Fix the bug that wrong zoom value is set in takePicture.
| * Fix the bug that wrong zoom value is set in takePicture.Wu-cheng Li2009-10-301-0/+3
| | | | | | | | | | | | The application does not getParameters in takePicture due to performance. After smooth zoom, zoom value has been changed. But mParameters of the app still keeps the the old value. This is a regression. b2226717
* | Merge change Ia4e7b972 into eclair-mr2Android (Google) Code Review2009-10-30105-3050/+2
|\ \ | | | | | | | | | | | | * changes: remove unused resource files and elements
| * | remove unused resource files and elementsOwen Lin2009-10-29105-3050/+2
| | | | | | | | | | | | Change-Id: Ia4e7b9724501c0a1c5c16008390e0116bb409c14
* | | Merge change I7b25fde1 into eclair-mr2Android (Google) Code Review2009-10-3031-5974/+127
|\ \ \ | |/ / | | | | | | | | | * changes: Remove unused code in Camera app.
| * | Remove unused code in Camera app.Owen Lin2009-10-2931-5974/+127
| | | | | | | | | | | | Change-Id: I7b25fde19a172b6910d0217581cf61152d494a82
* | | am 9c0f684c: Lift the upperbound of initial up-scaling.Cheng-Ru Lin2009-10-291-3/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit '9c0f684c416ff74b71c289a9c195e9a95b4f0563' into eclair-mr2 * commit '9c0f684c416ff74b71c289a9c195e9a95b4f0563': Lift the upperbound of initial up-scaling.
| * | Lift the upperbound of initial up-scaling.Cheng-Ru Lin2009-10-291-3/+3
| | | | | | | | | | | | | | | | | | http://b/issue?id=2223577 Change-Id: I9af997b342b16c5c7bef58e779e1c9fdbb42ac92
* | | am 5fd875e3: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-10-290-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '5fd875e3c20895e6ef30bb4c5416d32c853ee314' into eclair-mr2 * commit '5fd875e3c20895e6ef30bb4c5416d32c853ee314': Import revised translations. DO NOT MERGE
| * | Import revised translations. DO NOT MERGEEric Fischer2009-10-282-44/+44
| | |
* | | am 316af30d: Use zoom api. b2060030Wu-cheng Li2009-10-261-57/+49
|\ \ \ | |/ / | | / | |/ |/| | | | | Merge commit '316af30d026dd182edb482ef6de7a330d6b1b012' into eclair-mr2 * commit '316af30d026dd182edb482ef6de7a330d6b1b012': Use zoom api. b2060030
| * Use zoom api. b2060030Wu-cheng Li2009-10-221-57/+49
| |
* | am 18b4cf29: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-10-220-0/+0
|\ \ | |/ | | | | | | | | | | Merge commit '18b4cf29833270c127d1f0f732301b5b30cdb713' into eclair-mr2 * commit '18b4cf29833270c127d1f0f732301b5b30cdb713': Import revised translations. DO NOT MERGE
| * Import revised translations. DO NOT MERGEEric Fischer2009-10-2119-2112/+1069
| | | | | | | | Approver: jerryw
* | am da460876: Chagne CropImage invocation to non-explicit.Cheng-Ru Lin2009-10-222-6/+6
|\ \ | |/ | | | | | | | | | | Merge commit 'da4608768624b1fb492f6676c510b37ad5f294ba' into eclair-mr2 * commit 'da4608768624b1fb492f6676c510b37ad5f294ba': Chagne CropImage invocation to non-explicit.
| * Chagne CropImage invocation to non-explicit.Cheng-Ru Lin2009-10-212-6/+6
| | | | | | | | Change-Id: I38d5e9bee524c5e63c2457751756ee800c9b1947
* | am 3dea5d76: Hide 2D gallery in launcher.Cheng-Ru Lin2009-10-221-109/+8
|\ \ | |/ | | | | | | | | | | Merge commit '3dea5d7604a0a84cbcf7c3aaf23f62a7a7b5765e' into eclair-mr2 * commit '3dea5d7604a0a84cbcf7c3aaf23f62a7a7b5765e': Hide 2D gallery in launcher.
| * Hide 2D gallery in launcher.Cheng-Ru Lin2009-10-201-109/+8
| | | | | | | | | | | | | | Hide 2D gallery in the launcher and also hide other activities of gallery by removing their intent filter. Change-Id: I401b1c032b4c519b666a61743bfc6814dbaa2724
* | am 22a695f8: Fix the bug that one-item only settings still shown on menu.Owen Lin2009-10-201-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '22a695f8ca31dc2899e7206d68316c7e6d960657' into eclair-mr2 * commit '22a695f8ca31dc2899e7206d68316c7e6d960657': Fix the bug that one-item only settings still shown on menu.
| * Fix the bug that one-item only settings still shown on menu.Owen Lin2009-10-201-1/+1
| | | | | | | | | | Change-Id: I6c57ed929f74d9f170b3e07c4db54134b2869e78 http://b/issue?id=2196476
* | am 7c176f50: Insert the wait time before collecting the last memory usage ↵Yu Shan Emily Lau2009-10-191-0/+2
|\ \ | |/ | | | | | | | | | | | | | | for image capture. Merge commit '7c176f507491ec32166417d87caf27e2766df91f' into eclair-mr2 * commit '7c176f507491ec32166417d87caf27e2766df91f': Insert the wait time before collecting the last memory usage for image capture.
| * Insert the wait time before collecting the last memory usage for image capture.Yu Shan Emily Lau2009-10-151-0/+2
| |
* | Merge change I58068fd6 into eclair-mr2Android (Google) Code Review2009-10-191-6/+8
|\ \ | | | | | | | | | | | | * changes: Fix 2192954: Camera/camcorder switch status is wrong.
| * | 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
|\ \ \ | |/ / | | | | | | | | | * changes: Fix 2186855: NPE in ViewImage.setImage.
| * | 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
|/ / | | | | | | | | | | http://b/editIssue?id=2178247 Change-Id: Icbd4eb80b88027f538ddeb4a44316e2b2be911c9
* | 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
| | | | | | | | | | Bug: http://b/issue?id=2109092 Change-Id: Ia9b5cb7dfd6abd5c77e34e408cb761b4145bfd3d
* | Fix 2150734.Chih-Chung Chang2009-10-141-3/+21
| | | | | | | | | | | | The problem seems to be the media player is re-created when we get window focus after onPause. We now only create media player when the activity is resumed and has focus.
* | Fix 2182549: Disable search button when using camera.Chih-Chung Chang2009-10-1413-12/+38
| |
* | Import revised translations. DO NOT MERGEEric Fischer2009-10-136-12/+12
| |
* | am d10dda27: Fix the layout of title in Gallery-Picker.Owen Lin2009-10-131-0/+5
|\ \ | |/ | | | | | | | | | | Merge commit 'd10dda271e22fd312381eb3437b0541525498452' into eclair-mr2 * commit 'd10dda271e22fd312381eb3437b0541525498452': Fix the layout of title in Gallery-Picker.
| * Fix the layout of title in Gallery-Picker.Owen Lin2009-10-131-0/+5
| | | | | | | | | | | | Bug number: http://b/issue?id=2180043 Change-Id: Ic852a89f6ae6c5d950c8ea93e739d17bf51680f4
* | Merge change Ic04ffcd9 into eclair-mr2Android (Google) Code Review2009-10-091-0/+1
|\ \ | | | | | | | | | | | | * changes: Fix 2177752: NPE in onShareMultipleClicked.
| * | 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
|/ / | | | | | | This is tested on G1, and has no visible difference.
* | Show flash-off indicator on the view-finder.Owen Lin2009-10-063-2/+13
| | | | | | | | | | For those devices without flash support, we will use a new mode: NO_FLASH_MODE and show no indicator on the view finder.
* | Utilize group id to request & cancel thumbnail requests.Ray Chen2009-10-068-19/+65
| |
* | am a5d6b703: Adapt to new zoom callback.Wu-cheng Li2009-10-061-4/+5
|\ \ | |/ | | | | | | | | | | Merge commit 'a5d6b70326c4474770d30f6e6fb3b08cacf1cdfd' into eclair-mr2 * commit 'a5d6b70326c4474770d30f6e6fb3b08cacf1cdfd': Adapt to new zoom callback.
| * Adapt to new zoom callback.Wu-cheng Li2009-10-061-4/+5
| | | | | | | | b2060030
* | am 8d20bb47: Merge change I77245f28 into eclairChih-Chung Chang2009-10-053-3/+4
|\ \ | |/ | | | | | | | | | | Merge commit '8d20bb47f4eacbb9438e5d3e13f89cb8a3a35e87' into eclair-mr2 * commit '8d20bb47f4eacbb9438e5d3e13f89cb8a3a35e87': Fix 2166632: Change of wording in Camera ->Video ->Settings
| * Merge change I77245f28 into eclairAndroid (Google) Code Review2009-10-053-3/+4
| |\ | | | | | | | | | | | | * changes: Fix 2166632: Change of wording in Camera ->Video ->Settings
| | * Fix 2166632: Change of wording in Camera ->Video ->SettingsChih-Chung Chang2009-10-053-3/+4
| | |
* | | am 13874d7f: Fix the bug sometimes record counter does not increment.Wu-cheng Li2009-10-051-4/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '13874d7f42be37f1c4eb94320737b10d63527c46' into eclair-mr2 * commit '13874d7f42be37f1c4eb94320737b10d63527c46': Fix the bug sometimes record counter does not increment.