summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
Commit message (Collapse)AuthorAgeFilesLines
* Make all wheel icons rotatable.repo sync2011-07-187-13/+35
| | | | | | +Make the popup menu rotatable. bug:5039041 Change-Id: I28394531d5c0894215b8229159cfe9c7bee958b9
* Merge the different implementations on CameraSwitch.repo sync2011-07-162-41/+26
| | | | | | | +enable the camera/video icon rotation for tablet version. +render disabled effect for tablet only. Change-Id: I2827cb57ac7d8d60efdb6f3172c89db32ac443d4
* Merge "Fix wrong preview border drawable is displayed in phone UI."Wu-cheng Li2011-07-111-2/+2
|\
| * Fix wrong preview border drawable is displayed in phone UI.Wu-cheng Li2011-07-111-2/+2
| | | | | | | | Change-Id: Iccee528e8e3681f22480a0b726dac90c46757a5f
* | Merge "Check in Mosaic.java - the Java interface to JNI."Wei-Ta Chen2011-07-081-0/+139
|\ \ | |/ |/|
| * Check in Mosaic.java - the Java interface to JNI.Wei-Ta Chen2011-07-081-0/+139
| | | | | | | | Change-Id: Id3a84177aa6978499c5a8b1cff78b44759989119
* | Move zoom buttons and front/back camera switch to indicator wheel.Wu-cheng Li2011-07-088-262/+385
|/ | | | | | bug:5001059 Change-Id: I5ed60169b6f73dc41d84ba7bd299ed8bf394a284
* Remove color effect in camcorder app.Wu-cheng Li2011-07-072-14/+4
| | | | | | bug:5000060 Change-Id: Iaac250dfb0cabf3d6d6a9c563d432d9fac889a3d
* Refactor ZoomPicker.Wu-cheng Li2011-07-063-29/+24
| | | | | | | | Zoom buttons will not be in a LinearLayout. Refactor ZoomPicker so it can accept two zoom buttons as input. It does not matter where the zoom buttons are. Change-Id: I445228b03adc96a1e7b4ba90025680c8ef0388a2
* Remove jpeg quality.Wu-cheng Li2011-07-064-58/+5
| | | | | | | | Jpeg quality (super fine, fine, normal) is confusing for some users. Just always use super fine. This also simplifies the UI. bug:4993146 Change-Id: I55c2bf7d5aa8391f1656e3d5fdd0e7b2732459ed
* Add expanded thumbnail in phone UI.Wu-cheng Li2011-07-056-64/+330
| | | | | | bug:4725968 Change-Id: I2a59a3714b93bc96f2a1689d948c9e4e0edd14cb
* Lock the camera if starting recording fails.Wu-cheng Li2011-06-291-0/+2
| | | | | bug:4965716 Change-Id: I271ceb3790bd2d13d597c77cd26659d47298bb3a
* Move share button beside thumbnail in phone UI.Wu-cheng Li2011-06-287-91/+30
| | | | | | bug:4725968 Change-Id: Iedd0b631b48bb30c27975ddc44923886e4b0d862
* Add camcorder zoom.Wu-cheng Li2011-06-273-26/+152
| | | | | | bug:2644213 Change-Id: I669966e4fd54c76d19660efa6f1700a86b4d6c07
* Fix NPE when video cannot be inserted to media store.Wu-cheng Li2011-06-221-5/+7
| | | | Change-Id: I9f37c9aaca22377e3f169ae126dad4f870211eee
* Reset metering area in 3 seconds.Wu-cheng Li2011-06-201-7/+11
| | | | | | | | | After metering area is changed, reset it in 3 seconds if users do not take a picture. bug:3475893 Change-Id: I531189284053f1ede74dfe7dfafea6b682052596
* Check if device policay manager has disabled camera.Wu-cheng Li2011-06-174-67/+84
| | | | | | | | Show the corresponding message if that is the case. bug:4185309 Change-Id: I0f4a5ac577f13331685f8e7343bab6317f96c3d8
* Code refactor.Wu-cheng Li2011-06-162-62/+56
| | | | | | | | | 1. Make Camera and VideoCamera more consistent. 2. Fix error dialog is not displayed if VideoCamera fails to connect to camrea. 3. Move the code from onStart to onResume. Change-Id: I7dd310718e0986c17a762ca3107924cc412f72cc
* Change the thumbnail folder to internal storage.Wu-cheng Li2011-06-153-11/+12
| | | | | | | | | The app did not check if .thumbnail folder is created because it used to be created by gallery a long time ago. Thumbnails would fail to be saved if .thumbnail did not exist. bug:4483083 Change-Id: I03c345f35ab1880878457d2537bbff18c175899c
* am 5665e379: am 4b478c99: Merge "Camcorder HUD no longer disappears when ↵Wu-cheng Li2011-06-081-2/+2
|\ | | | | | | | | | | | | opening slider" * commit '5665e3790841ffc54ab3494ef6627026d5048a8c': Camcorder HUD no longer disappears when opening slider
| * am 4b478c99: Merge "Camcorder HUD no longer disappears when opening slider"Wu-cheng Li2011-06-071-2/+2
| |\ | | | | | | | | | | | | * commit '4b478c9940ad3e79f1c99ad70b2aa7b4643b3946': Camcorder HUD no longer disappears when opening slider
| | * Camcorder HUD no longer disappears when opening sliderThomas Hultgren2011-05-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The camcorder head up display was incorrectly detached when opening the slider. Changed behavior to conform with the camera head up display. Change-Id: Ie52ab641c0702cbae5e04530a40f992ded8923bc
* | | Fix NPE on launch if camera cannot be opened.Wu-cheng Li2011-06-072-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If camera cannot be opened, the app will show a dialog and finish the acitivty. But if the screen is turned off and on when the dialog is still there, the app will enter onResume again. bug:4556340 Change-Id: Icc331baa14f5e17b178e2022d61e5da55398df40
* | | am dd56e778: am a5c1d8bf: Fix some comments.Wu-cheng Li2011-05-312-6/+6
|\ \ \ | |/ / | | | | | | | | | * commit 'dd56e778e4f16a615b62961bbb9588feeac9200f': Fix some comments.
| * | Fix some comments.Wu-cheng Li2011-05-252-6/+6
| | | | | | | | | | | | | | | bug:4473360 Change-Id: If87b14a1613b1c8d4095961665944ee0db70c7ca
* | | Merge "Add share button for phone UI."Wu-cheng Li2011-05-277-4/+78
|\ \ \
| * | | Add share button for phone UI.Wu-cheng Li2011-05-267-4/+78
| | | | | | | | | | | | | | | | | | | | | | | | bug:4391419 Change-Id: I80c19f65d6f17733a9ccee6782bc035add12efc3
* | | | Merge "Print video name for debugging."Wu-cheng Li2011-05-261-1/+3
|\ \ \ \
| * | | | Print video name for debugging.Wu-cheng Li2011-05-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes stagefright crashes at AVCDecoder.cpp in monkey test. Print the filename so we can get the file. bug:4109304 Change-Id: I4d248c5602f3326c014ad37a4270d0e61eb53fc6
* | | | | Increase the actual focus and metering area.Wu-cheng Li2011-05-261-15/+18
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If users touch on a dark area, preview will be easily over-exposed. So increase the metering area to reduce the odds. However, keep the rectangle the same size because a huge rectangle looks strange on UI. Now the actual focus/metering area is two times bigger than the UI. bug:3475893 Change-Id: I1c3623b253f8c72c6180671d49f205ccb28af29a
* | | | Move gps indicator from the indicator bar to the corner.Wu-cheng Li2011-05-263-84/+2
| | | | | | | | | | | | | | | | | | | | | | | | bug:4391419 Change-Id: I5d4385edd51d3df21d4bcdd17a80dc778a832b94
* | | | Merge "Improve touch focus UI."Wu-cheng Li2011-05-252-15/+35
|\ \ \ \ | |/ / / |/| | |
| * | | Improve touch focus UI.Wu-cheng Li2011-05-232-15/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Now users can trigger touch focus if autofocus is already in progress. 2. Autofocus is triggered in ACTION_UP. So users can drag the focus rectangle and see exposure change. bug:3475893 Change-Id: Ifbf586ae5ec2a11c64155e16bd25ae753220f4ce
* | | | am 9bb90c3b: am 2049ccfd: Fix NPE in phone UI.Wu-cheng Li2011-05-242-10/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '9bb90c3b940421a60251d2fb94b586461c544d5d': Fix NPE in phone UI.
| * | | Fix NPE in phone UI.Wu-cheng Li2011-05-212-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Phone UI assumes the on-screen icon changes when the setting changes. Time lapse interval does not have icons yet. Remove it from phone UI for now. bug:4473360 Change-Id: Id413ea5fec58e26b78e44db4ac30e6c2d2a29106
* | | | Clean up package declarations & importsAndy Stadler2011-05-233-14/+7
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | No functional change. Just makes eclipse happier. The specific fix is that RotateImageView had the wrong package declaration, everything else is just cleanup after fixing that. Change-Id: If862539e33af12a4cb0b24c9b7591f548340cab5
* | | am 41fff6e7: am e2eebff5: Fix NPE in capture intent of phone UI.Wu-cheng Li2011-05-192-8/+7
|\ \ \ | |/ / | | | | | | | | | * commit '41fff6e73898387612b17737085ad2321a2727c4': Fix NPE in capture intent of phone UI.
| * | Fix NPE in capture intent of phone UI.Wu-cheng Li2011-05-192-8/+7
| | | | | | | | | | | | | | | bug:4454373 Change-Id: Icaeba621e619d826f91b6bf73a0f57e4fc520fa5
* | | Show review image before share.Wu-cheng Li2011-05-173-25/+47
| | | | | | | | | | | | | | | | | | bug:4391419 Change-Id: Id357539bfe36eb3a30742dc4f8ca267ff53ff8b7
* | | Refactor RotateImageView and thumbnail.Wu-cheng Li2011-05-176-341/+315
| | | | | | | | | | | | Change-Id: Ic435b7cd97ba775ec8f4b8342a1d4d25e2a5120c
* | | Remove dead code and reduce visibility.Wu-cheng Li2011-05-175-172/+12
| | | | | | | | | | | | Change-Id: Icec126d3d83f3b158d284dd63dfed8452ffa2249
* | | Refactor preview frame layout.Wu-cheng Li2011-05-121-21/+15
| | | | | | | | | | | | Change-Id: Ief0acb3841078a36974e315054110bd9070a1f3f
* | | Remove unused code and resource.Wu-cheng Li2011-05-122-15/+2
| | | | | | | | | | | | Change-Id: Ia6d98847716ef187eefd05758c5c61b530967b27
* | | Add share button in IndicatorWheel.Wu-cheng Li2011-05-113-37/+101
| | | | | | | | | | | | | | | | | | | | | | | | Also fix a bug that warning toast is not shown when white-balance or flash icon is pressed in scene mode. bug:4391419 Change-Id: I724870347616a5a9a7d9007696eb08b923d18d54
* | | Merge "Refactor IndicatorWheel."Wu-cheng Li2011-05-106-93/+83
|\ \ \
| * | | Refactor IndicatorWheel.Wu-cheng Li2011-05-106-93/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Combine BasicSettingPopup and OtherSettingsPopup in indicatorWheel for the preparation of adding share button. bug:4391419 Change-Id: I684890a9bf47611f25fe0f70faa0f08e6485d620
* | | | Add test for converting touch point to focus area.Wu-cheng Li2011-05-101-9/+15
|/ / / | | | | | | | | | | | | | | | Also add license for some files. Change-Id: I492799aefad5afe771a082b90bf44f4301480be0
* | | Merge "Pass camera id while getting camcorder profile."Wu-cheng Li2011-05-062-21/+9
|\ \ \
| * | | Pass camera id while getting camcorder profile.Wu-cheng Li2011-05-062-21/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also prevents NPE during variable initialization if camera module fails to load. When camera module fails to load, CamcorderProfile.get(int) will return null. bug:4381780 Change-Id: I14a9af9e6f172cd02ef6df11ed81f1655361618a
* | | | Fix the bug that touch focus is cancelled unexpectedly.Wu-cheng Li2011-05-051-1/+2
| | | | | | | | | | | | | | | | Change-Id: I94d8277d07e37b41b149ec7a162b99f1d381d442
generated by cgit v1.1 at 2025-01-13 21:46:10 +0000