summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow saving panorama after the activity is paused. (do not merge)Angus Kong2012-01-123-34/+75
* Use default volume control stream instead of the music stream.Eino-Ville Talvala2012-01-051-2/+0
* Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-12-062-3/+3
|\
| * Import revised translations. DO NOT MERGEEric Fischer2011-12-062-3/+3
* | Fix crash after restoring defaults.Wu-cheng Li2011-12-061-0/+3
|/
* Import revised translations. DO NOT MERGEEric Fischer2011-11-293-5/+5
* Fix NPE if the camera cannot be connected.Wu-cheng Li2011-11-281-1/+1
* Dismiss open menu if exists.Chung-yih Wang2011-11-223-0/+11
* Merge "Update camera sound API." into ics-mr1Wu-cheng Li2011-11-214-8/+21
|\
| * Update camera sound API.Wu-cheng Li2011-11-184-8/+21
* | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-213-18/+18
|\ \
| * | Import revised translations. DO NOT MERGEEric Fischer2011-11-213-18/+18
| |/
* | Fix share popup is not aligned with viewfinder.Wu-cheng Li2011-11-211-1/+1
|/
* 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
* | 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
* | Merge "Rotate priority indicators according to the device orientation." into ...Wei Huang2011-11-177-79/+57
|\ \ | |/ |/|
| * Rotate priority indicators according to the device orientation.Wu-cheng Li2011-11-177-79/+57
* | Merge "Fix EffectsRecorder error path handling when ending recording." into i...Eino-Ville Talvala2011-11-161-1/+7
|\ \
| * | Fix EffectsRecorder error path handling when ending recording.Eino-Ville Talvala2011-11-161-1/+7
* | | 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
| | |/ | |/|
* | | 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
* | | | 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
* | | | | Merge "Fix the ArrayIndexOutOfBound issue." into ics-mr1Wei Huang2011-11-161-13/+17
|\ \ \ \ \
| * | | | | Fix the ArrayIndexOutOfBound issue.Chung-yih Wang2011-11-161-13/+17
* | | | | | am 30f26f91: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ 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
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | 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
| |_|/ / / / |/| | | | |
* | | | | | 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
| | |_|_|/ | |/| | |
* | | | | 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
| |/ / / /
* | | | | 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
* | | | | | Add location information in Camcorder mode.Angus Kong2011-11-151-0/+5
| |/ / / / |/| | | |
* | | | | bug #5612744: guard against NPE found by Monkey.Wei Huang2011-11-141-0/+21
* | | | | Merge "Fix several UI bugs." into ics-mr1Wei Huang2011-11-148-9/+74
|\ \ \ \ \
| * | | | | Fix several UI bugs.Chung-yih Wang2011-11-148-9/+74
* | | | | | 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
| |/ / / / /
* | | | | | 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
| |/ / / / /