summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge "Fix NPE in panorama when camera failed to connect." into ics-mr1Chih-yu Huang2011-11-181-20/+18
|\
| * Fix NPE in panorama when camera failed to connect.Chih-yu Huang2011-11-181-20/+18
| | | | | | | | | | bug:5637587 Change-Id: Iea275b4e3780a41f4a0c3fe0845acbfdb1e95cd1
* | Merge "Fix OpenGL processing when activity is not active." into ics-mr1Angus Kong2011-11-171-0/+6
|\ \ | |/ |/|
| * Fix OpenGL processing when activity is not active.Angus Kong2011-11-181-0/+6
| | | | | | | | | | bug:5624690 Change-Id: I87af684e165a275adb4b765a86a2df2b62137ca0
* | Merge "Rotate priority indicators according to the device orientation." into ↵Wei Huang2011-11-177-79/+57
|\ \ | |/ |/| | | ics-mr1
| * Rotate priority indicators according to the device orientation.Wu-cheng Li2011-11-177-79/+57
| | | | | | | | | | | | | | | | + Do not show flash indicator if it is off. bug:5039279 Change-Id: I329b63d04f46fbe23f5ade3e4cacf446ce41f98c
* | Merge "Fix EffectsRecorder error path handling when ending recording." into ↵Eino-Ville Talvala2011-11-161-1/+7
|\ \ | | | | | | | | | ics-mr1
| * | Fix EffectsRecorder error path handling when ending recording.Eino-Ville Talvala2011-11-161-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if mRunner had already been set to null, errors sent by mediarecorder would not be propagated to VideoCamera correctly. This resulted in crashes when putting device to sleep right after starting timelapse recording with effects. Bug: 5627242 Change-Id: I3ae3c713a0aaf9a4507442bbbcd3ec89971d5f95
* | | Merge "Update the panorama capturing progress correctly." into ics-mr1Wei-Ta Chen2011-11-161-17/+20
|\ \ \
| * | | Update the panorama capturing progress correctly.Wei-Ta Chen2011-11-151-17/+20
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue that the termination condition on the sweeping angle is broken. Fix another issue that the panning speed and sweeping angle does not consider the cases that users hold a device in portrait or panning the device vertically. Bug: 5623138 Change-Id: I9d1e2e5ad63a97beb8cfe2404974329c70d46991
* | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-1649-148/+148
|\ \ \
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-11-1649-148/+148
| | | | | | | | | | | | | | | | Change-Id: I9c739c560799166155e1578ce597e174d4304cd6
* | | | Merge "Fix crash: camera swap w/ custom Background video" into ics-mr1Pannag Sanketi2011-11-161-4/+13
|\ \ \ \
| * | | | Fix crash: camera swap w/ custom Background videoPannag Sanketi2011-11-151-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The background uri was not getting stored when swapping the camera leading to a crash. Now it is sent via the intent. Related Bug: 5585381 Change-Id: I05aea8321f0d2df96f646119eddd6a8b6a8ac668
* | | | | Merge "Fix the ArrayIndexOutOfBound issue." into ics-mr1Wei Huang2011-11-161-13/+17
|\ \ \ \ \
| * | | | | Fix the ArrayIndexOutOfBound issue.Chung-yih Wang2011-11-161-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5619774 It was caused by the error of the radian computation for rotation of the indicator wheel. Originally we assume the angle of the first and the last indicator in the second-level settings should be the same as predefined angles. In fact, there was some computational error during rotation. Change-Id: I508f42c5224170ac721562e20be8ed638485e023
* | | | | | am 30f26f91: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | * commit '30f26f912211751b4b28ac2f0e30af0430765214':
| * | | | | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib5a550f4261b0810187d95e9a7844144641b322b
* | \ \ \ \ \ Merge "Broadcast for new image added in panorama mode." into ics-mr1Angus Kong2011-11-161-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Broadcast for new image added in panorama mode.Angus Kong2011-11-161-0/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | bug:5624740 Change-Id: I0663b34eb07e28e3f4e8b65b0c2c2befce3ca430
* | | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | Change-Id: I0d5ce944499ccd0802d2385e5ade01f613ccefc5
| * | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-100-0/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
* | | | | | | Fix NPE if the device has only one camera.Wu-cheng Li2011-11-161-1/+3
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | bug:5620872 Change-Id: I4ee2aa85e73c53d6a72f0839ed3bf31bc14c586e
* | | | | | Merge "Set the orientation of a panorama image." into ics-mr1Wei-Ta Chen2011-11-153-5/+56
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Set the orientation of a panorama image.Wei-Ta Chen2011-11-153-5/+56
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The panorama image returned from the panorama library is oriented based on the natural orientation of the camera. We set an orientation in its EXIF header, so that the image can be displayed correctly. The orientation is calculated by compensating the device orientation and the camera orientation respective to the natural orientation of the device. Bug: 5603313 Change-Id: Id6907cb08a7ff77e44736f3c3cd1503e7a68d783
* | | | | Merge "Start Effects Recording only after preview loads" into ics-mr1Pannag Sanketi2011-11-152-0/+18
|\ \ \ \ \
| * | | | | Start Effects Recording only after preview loadsPannag Sanketi2011-11-152-0/+18
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start Effects Recording only after we get SurfaceTexture Callback in EffectsRecorder, and hence preview loaded. Disable the shutter button on creation, and re-enable it on the preview callback. Else, one could potentially start the recording before the preview loads, leading to a wrong state information and an eventual crash. Related Bugs: 5605173, 5605658 Change-Id: I2ed766997294c165ce6c262cf47f124493d0c5ec
* | | | | Merge "Switch sound playing to use Camera.playSound()" into ics-mr1Eino-Ville Talvala2011-11-156-211/+15
|\ \ \ \ \
| * | | | | Switch sound playing to use Camera.playSound()Eino-Ville Talvala2011-11-086-211/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a few private APIs to properly manage audio output for panorama, effects recording, and focus notification, use the new Camera API for sound playback. Bug: 5447107 Change-Id: I7d5a3d9502f36c199ea75a89e2c6b878185f880f
* | | | | | Add location information in Camcorder mode.Angus Kong2011-11-151-0/+5
| |/ / / / |/| | | | | | | | | | | | | | | | | | | bug:5560253 Change-Id: I090722d6755068fa4a70a900e18af28a1adc9bf1
* | | | | bug #5612744: guard against NPE found by Monkey.Wei Huang2011-11-141-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cl https://android-git.corp.google.com/g/#/c/149421/5 removed the null pointer checking. This leads to Monkey crashes. It seems that we either need to call initOnScreenIndicator() in onCreate(), or check for null in the updateXXXIndicator() methods. I thought about moving initOnScreenIndicator() to onCreate(), but didn't want to introduce any latency for starting up the camera app. Change-Id: I8b9fecb5eb77dc1afef9725fd3d3d4dbe5048c9d
* | | | | Merge "Fix several UI bugs." into ics-mr1Wei Huang2011-11-148-9/+74
|\ \ \ \ \
| * | | | | Fix several UI bugs.Chung-yih Wang2011-11-148-9/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5575970 1. The cancel button of the background replacer message should be on the bottom. 2. The location of recording timer was too low in the landscape mode. 3. Fix the animation of the setting popup. Change-Id: Ia2345e72efc0118cd0172af4bd6243815c602493
* | | | | | Merge "Fix too small panorama review on phones." into ics-mr1Wei Huang2011-11-142-5/+10
|\ \ \ \ \ \
| * | | | | | Fix too small panorama review on phones.Angus Kong2011-11-142-5/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | bug:5611399 Change-Id: I09c400d0faa7e5753a728f2a8ba9a8bc4fcf5a77
* | | | | | Merge "Add a rotatable toast class." into ics-mr1Wei Huang2011-11-1412-78/+105
|\ \ \ \ \ \
| * | | | | | Add a rotatable toast class.Chung-yih Wang2011-11-1412-78/+105
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5575970 In order to show the toast in a landscape orientation with portrait layout. The rotatable toast helper class is implementated and is also applied for first-hint toast messages. Change-Id: I942e87df1c1a4509d01cd41e2ecbdc2e2dfec049
* | | | | | Adjust the height of panorama live-view.Angus Kong2011-11-142-2/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | bug:5142001 Change-Id: I0e55da11603e7adc8f21b7a6577ff5f3f4fe92a4
* | | | | Mirroring issue in Background ReplacerPannag Sanketi2011-11-112-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MediaSource is set to rotate so that it adjusts to the rotation of the device, and displays upright. The backdropper does not have to do any rotation except for the mirroring in case of front camera. Bug: 5490654 Change-Id: Iaa3a82dd98f9cf428fb0d0b65e1175b31d37d2b1
* | | | | Merge "Add indicators of settings on the viewfinder." into ics-mr1Wei Huang2011-11-1165-48/+114
|\ \ \ \ \
| * | | | | Add indicators of settings on the viewfinder.Chih-yu Huang2011-11-1165-48/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add exposure, flash, scene, white balance, and focus indicators. bug:5039279 Change-Id: I7ef87ee35855030dbc8fdc2d4c52fa5d8b6549ba
* | | | | | Merge "Fix 5603781: The pressed state of close icon does not disappear." ↵Wei Huang2011-11-111-13/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into ics-mr1
| * | | | | | Fix 5603781: The pressed state of close icon does not disappear.Chih-Chung Chang2011-11-111-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd52cb5febf3a139d5007b6b2dd6adcb09934f99
* | | | | | | Merge "Fix sometimes share icons disappear." into ics-mr1Wei Huang2011-11-113-12/+17
|\ \ \ \ \ \ \
| * | | | | | | Fix sometimes share icons disappear.Wu-cheng Li2011-11-113-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5580133 Change-Id: I4f76ac8d03a54cfd7105e70ca4f1d643e01d3293
* | | | | | | | Merge "Adjust share UI to full-width." into ics-mr1Wei Huang2011-11-114-85/+153
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Adjust share UI to full-width.Angus Kong2011-11-114-85/+153
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5521011 Change-Id: I66aab65763224cbb66aa721d49d3e4ea916d8a58
* | | | | | | Merge "Do not reset the focus if next snapshot is pending." into ics-mr1Wu-cheng Li2011-11-102-8/+16
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Do not reset the focus if next snapshot is pending.Wu-cheng Li2011-11-102-8/+16
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Suupose autofocus is focusing and a picture will be taken when focus callback arrives. Remeber the next snapshot request if the shutter button is clicked. bug:5589632 Change-Id: Ice8df7145f68996bd307fa5914e1c672bc624239
* | | | | | Fix 5336037: OOM because there are multiple instances of camera activities.Chih-Chung Chang2011-11-101-1/+0
| |/ / / / |/| | | | | | | | | | | | | | Change-Id: Idf56adc6f4d667b37238d1507c3ebc399680e75d
generated by cgit v1.1 at 2024-12-22 07:53:53 +0000