summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge "Reset mCurrentVideoUri to null before starting recording." into ics-mr1Wu-cheng Li2011-11-091-0/+1
|\ \ \ \ \
| * | | | | Reset mCurrentVideoUri to null before starting recording.Heechan Park2011-11-101-0/+1
| |/ / / /
* | | | | am b27cfa9c: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-090-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-081-2/+2
* | | | | New ZoomControl UI for tablet.Chung-yih Wang2011-11-096-130/+118
| |/ / / |/| | |
* | | | Changes to resolve jagged horizontal edge and blurred vertical edge issues.mbansal2011-11-082-11/+18
* | | | Merge "Fix NPE when returned child is null." into ics-mr1Angus Kong2011-11-070-0/+0
|\ \ \ \
| * | | | Fix NPE when returned child is null.Angus Kong2011-11-081-1/+1
* | | | | Change highlight pattern in indicatorbar.Chih-yu Huang2011-11-087-46/+33
|/ / / /
* | | | Merge "Change effect settings popup styles." into ics-mr1Wei Huang2011-11-075-6/+25
|\ \ \ \
| * | | | Change effect settings popup styles.Angus Kong2011-11-045-6/+25
* | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-0749-214/+91
|\ \ \ \ \
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-0749-214/+91
* | | | | | Merge "Make dialog rotatable in Video mode." into ics-mr1Wei Huang2011-11-072-23/+7
|\ \ \ \ \ \
| * | | | | | Make dialog rotatable in Video mode.Angus Kong2011-11-072-23/+7
* | | | | | | Merge "Fix the unresposible close button." into ics-mr1Wei Huang2011-11-071-3/+9
|\ \ \ \ \ \ \
| * | | | | | | Fix the unresposible close button.Chung-yih Wang2011-11-071-3/+9
| |/ / / / / /
* | | | | | | Merge "Prevent starting face detection twice." into ics-mr1Wei Huang2011-11-071-2/+10
|\ \ \ \ \ \ \
| * | | | | | | Prevent starting face detection twice.Chih-yu Huang2011-11-071-2/+10
| |/ / / / / /
* | | | | | | Merge "Make 40% opacity for disabled indicators." into ics-mr1Wei Huang2011-11-074-11/+10
|\ \ \ \ \ \ \
| * | | | | | | Make 40% opacity for disabled indicators.Angus Kong2011-11-074-11/+10
| |/ / / / / /
* | | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-070-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-040-0/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | am 38b93041: (-s ours) Fix video capture intent preview alert for effects. DO...Eino-Ville Talvala2011-11-040-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix video capture intent preview alert for effects. DO NOT MERGE.Eino-Ville Talvala2011-11-041-6/+22
* | | | | | Fix an OOM issue in mosaic blending.Wei-Ta Chen2011-11-043-4/+51
| |_|/ / / |/| | | |
| | | | |
| \ \ \ \
*-. \ \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Revert "Merge "Remove long pressing shutter triggers autocous." into ics-mr0"The Android Automerger2011-11-023-3/+55
| | * | | merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| | |\ \ \
| * | \ \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-030-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | am 93b9c8ac: Merge "5554028: Select video snapshot resolution based on the vi...Chih-Chung Chang2011-11-042-9/+43
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "5554028: Select video snapshot resolution based on the video recording...Chih-Chung Chang2011-11-032-9/+43
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 5554028: Select video snapshot resolution based on the video recording aspect...Chih-Chung Chang2011-11-022-9/+43
* | | | | | Merge "Change the style of cancel button in Panorama." into ics-mr1Angus Kong2011-11-042-7/+10
|\ \ \ \ \ \
| * | | | | | Change the style of cancel button in Panorama.Angus Kong2011-11-032-7/+10
* | | | | | | Merge "Enable full area when tapping "X" mark of review button." into ics-mr1Chih-yu Huang2011-11-031-3/+0
|\ \ \ \ \ \ \
| * | | | | | | Enable full area when tapping "X" mark of review button.Chih-yu Huang2011-11-041-3/+0
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Fix 'back to the first-level when recording'." into ics-mr1Chung-yih Wang2011-11-031-4/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix 'back to the first-level when recording'.Chung-yih Wang2011-11-031-4/+3
| |/ / / / /
* | | | | | Merge "Fix 5521540: UI Tweaks." into ics-mr1Wei Huang2011-11-0315-45/+66
|\ \ \ \ \ \
| * | | | | | Fix 5521540: UI Tweaks.Chih-Chung Chang2011-11-0315-45/+66
| |/ / / / /
* | | | | | Merge "The dialog for comfirmation is made rotatable." into ics-mr1Wei Huang2011-11-036-87/+208
|\ \ \ \ \ \
| * | | | | | The dialog for comfirmation is made rotatable.Angus Kong2011-11-036-87/+208
* | | | | | | Merge "Adjust the orientation of mode picker in Panorama." into ics-mr1Wei Huang2011-11-031-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Adjust the orientation of mode picker in Panorama.Angus Kong2011-11-031-1/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Enable camera controls after wakeup.Chung-yih Wang2011-11-031-19/+21
|/ / / / / /
* | | | | | Merge "Back to the first-level when recording on Tablet." into ics-mr1Chung-yih Wang2011-11-022-4/+14
|\ \ \ \ \ \
| * | | | | | Back to the first-level when recording on Tablet.Chung-yih Wang2011-11-022-4/+14
| |/ / / / /
* | | | | | Merge "Fix the disabled icons overlapped issue." into ics-mr1Chung-yih Wang2011-11-021-1/+2
|\ \ \ \ \ \
| * | | | | | Fix the disabled icons overlapped issue.Chung-yih Wang2011-11-021-1/+2
| |/ / / / /