summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 86b149d9 to masterWu-cheng Li2010-11-091-1/+1
|\
| * am 6e5a8f04: Set audio input source type to CAMCORDER in camcorder app.Wu-cheng Li2010-11-081-1/+1
| |\
| | * Set audio input source type to CAMCORDER in camcorder app.Wu-cheng Li2010-11-081-1/+1
* | | am c309fcde: am 35c8657f: Merge "Remove android.hardware.Camera.CAMERA_ID_DEF...Wu-cheng Li2010-11-081-2/+1
|\ \ \ | |/ /
| * | am 35c8657f: Merge "Remove android.hardware.Camera.CAMERA_ID_DEFAULT." into g...Wu-cheng Li2010-11-081-2/+1
| |\ \ | | |/
| | * Merge "Remove android.hardware.Camera.CAMERA_ID_DEFAULT." into gingerbreadWu-cheng Li2010-11-081-2/+1
| | |\
| | | * Remove android.hardware.Camera.CAMERA_ID_DEFAULT.Wu-cheng Li2010-11-081-2/+1
* | | | am b72942e2: (-s ours) am e424c1b9: Set video orientation hint according to d...Wu-cheng Li2010-11-080-0/+0
|\ \ \ \ | |/ / /
| * | | am e424c1b9: Set video orientation hint according to device orientation. do n...Wu-cheng Li2010-11-083-147/+157
| |\ \ \ | | |/ /
| | * | Set video orientation hint according to device orientation. do not mergeWu-cheng Li2010-11-083-147/+157
* | | | am d2861a4e: (-s ours) am 3ecd5f5a: Enable front-facing camera recording. do ...Wu-cheng Li2010-11-080-0/+0
|\ \ \ \ | |/ / /
| * | | am 3ecd5f5a: Enable front-facing camera recording. do not mergeWu-cheng Li2010-11-082-13/+6
| |\ \ \ | | |/ /
| | * | Enable front-facing camera recording. do not mergeWu-cheng Li2010-11-082-13/+6
| | |/
* | | am 3fdb2574: (-s ours) am 1b97e315: Remove front-facing camera recording. do ...Wu-cheng Li2010-11-040-0/+0
|\ \ \ | |/ /
| * | am 1b97e315: Remove front-facing camera recording. do not mergeWu-cheng Li2010-11-033-6/+21
| |\ \ | | |/
| | * Remove front-facing camera recording. do not mergeWu-cheng Li2010-11-043-6/+21
* | | Rename some classes and method names to avoid confusion.Wu-cheng Li2010-11-048-42/+42
* | | Add other settings to control panel.Wu-cheng Li2010-11-0213-39/+461
* | | Fixed the camera latency image capture test case with the new UI.Yu Shan Emily Lau2010-10-281-1/+2
* | | Import revised translations.Eric Fischer2010-10-2720-168/+425
* | | am 37da7901: (-s ours) am 5dc5b39e: Import revised translations. DO NOT MERGEEric Fischer2010-10-270-0/+0
|\ \ \ | |/ /
| * | am 5dc5b39e: Import revised translations. DO NOT MERGEEric Fischer2010-10-271-1/+1
| |\ \ | | |/
| | * Import revised translations. DO NOT MERGEEric Fischer2010-10-261-1/+1
* | | am 89213eb3: am 12a1f7a2: Fix the bug that wrong profile is selected after sw...Wu-cheng Li2010-10-261-1/+5
|\ \ \ | |/ /
| * | am 12a1f7a2: Fix the bug that wrong profile is selected after switching cameraWu-cheng Li2010-10-261-1/+5
| |\ \ | | |/
| | * Fix the bug that wrong profile is selected after switching cameraWu-cheng Li2010-10-261-1/+5
* | | am 7df08954: (-s ours) am 5ec1a9d8: Import revised translations. DO NOT MERGEEric Fischer2010-10-250-0/+0
|\ \ \ | |/ /
| * | am 5ec1a9d8: Import revised translations. DO NOT MERGEEric Fischer2010-10-2520-115/+75
| |\ \ | | |/
| | * Import revised translations. DO NOT MERGEEric Fischer2010-10-2520-115/+75
* | | Add other setting icon in indicator wheel.Wu-cheng Li2010-10-252-5/+14
* | | Merge "Rename some classes to avoid confusion."Wu-cheng Li2010-10-244-7/+7
|\ \ \
| * | | Rename some classes to avoid confusion.Wu-cheng Li2010-10-244-7/+7
* | | | am 12203b63: (-s ours) am 0659f6d3: Import revised translations. DO NOT MERGEEric Fischer2010-10-220-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 0659f6d3: Import revised translations. DO NOT MERGEEric Fischer2010-10-2220-101/+101
| |\ \ | | |/
| | * Import revised translations. DO NOT MERGEEric Fischer2010-10-2220-101/+101
* | | am 80db4870: am e440efc3: Replace shared storage with USB storage.Eric Fischer2010-10-211-9/+9
|\ \ \ | |/ /
| * | am e440efc3: Replace shared storage with USB storage.Eric Fischer2010-10-201-9/+9
| |\ \ | | |/
| | * Replace shared storage with USB storage.Eric Fischer2010-10-191-9/+9
* | | Add color effect UI to indicator wheel.Wu-cheng Li2010-10-2149-77/+64
* | | Merge "Fixed the camera image stress test with the new UI."Yu Shan Emily Lau2010-10-201-2/+3
|\ \ \
| * | | Fixed the camera image stress test with the new UI.Yu Shan Emily Lau2010-10-201-2/+3
* | | | Merge 559a4151 from gingerbread-plus-aospJean-Baptiste Queru2010-10-192-12/+20
|\ \ \ \ | | |/ / | |/| |
| * | | am c1dd7205: Fix wrong usage of setRotation and setOrientation.Wu-cheng Li2010-10-192-12/+20
| |\ \ \ | | | |/ | | |/|
| | * | Fix wrong usage of setRotation and setOrientation.Wu-cheng Li2010-10-192-12/+20
* | | | am 03f097a0: am a7c1c50e: Merge "Fix wrong aspect ratio of camera preview." i...Wu-cheng Li2010-10-181-13/+2
|\ \ \ \ | |/ / /
| * | | am a7c1c50e: Merge "Fix wrong aspect ratio of camera preview." into gingerbreadWu-cheng Li2010-10-181-13/+2
| |\ \ \ | | |/ /
| | * | Merge "Fix wrong aspect ratio of camera preview." into gingerbreadWu-cheng Li2010-10-181-13/+2
| | |\ \
| | | * | Fix wrong aspect ratio of camera preview.Wu-cheng Li2010-10-181-13/+2
* | | | | Show indicator wheel and zoom picker earlier.Wu-cheng Li2010-10-182-8/+8
* | | | | Change recording time position for xlarge layout.Wu-cheng Li2010-10-185-64/+149