summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | bug:5521011 Change-Id: Ia01bcbd8b1aa916406048b6890ab3439fe2f063a
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I19bed667d8a324af4042a81747b7723b0ab106d4
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5575805 Change-Id: I6776f2b1d5a174a95ab40f8480110f0a34fb41e0
* | | | | | | 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
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5575807 Change-Id: Ief2f51b363a5300989ae0fe7b047436b923a0386
* | | | | | | 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
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5563371 Change-Id: I23231c4c629ab85f203470368d40d67c91e43db2
* | | | | | | 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
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5521011 Change-Id: I150f754b9190e7034e75a3ab06cb0f5e8312cd31
* | | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-070-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | | Change-Id: I0e118040919876db2c9f4c5b4818c7fc8d5ba156
| * | | | | 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. ↵Eino-Ville Talvala2011-11-040-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE. * commit '38b930410fddaee169933ac18e55fdbf5cc51d84': Fix video capture intent preview alert for effects. DO NOT MERGE.
| * | | | | Fix video capture intent preview alert for effects. DO NOT MERGE.Eino-Ville Talvala2011-11-041-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In effects mode, stopping video record is asynchronous, and dealing with alerts and thumbnails has to be deferred until a done callback from the effectsrecorder. Cherry-pick from MR1 branch to fix 5567363 Bug: 5494625 Bug: 5567363 Change-Id: I20f59c94c97425267afb10f2acaad034e01ecae5
* | | | | | Fix an OOM issue in mosaic blending.Wei-Ta Chen2011-11-043-4/+51
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set two limits on when we will do mosaic blending. 1) mosaic_width * mosaic_height < (5 * frame_width) * (2 * frame_height) 2) mosaic_height < 2.5 * frame_height The latter limit rejects blending for the cases having too much movement in the secondary direction. Bug: 5554762 Change-Id: I05fb24bb1ff5446bea0cc1a1de8a02c37fb642d7
| | | | |
| \ \ \ \
*-. \ \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | Change-Id: I47964d937206f7e92a3d403550150a086f826369
| | * | | Revert "Merge "Remove long pressing shutter triggers autocous." into ics-mr0"The Android Automerger2011-11-023-3/+55
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4d55f6cb82c07a6191d2ab8e78fbab8c31e9db89, reversing changes made to 174b8b7fc4d55e8c63eb3ed0b71f1519a13e345d.
| | * | | 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 ↵Chih-Chung Chang2011-11-042-9/+43
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | video recording aspect ratio." into ics-mr0 * commit '93b9c8aca92b2a6a651c562c71b8c414458c1419': 5554028: Select video snapshot resolution based on the video recording aspect ratio.
| * | | | | Merge "5554028: Select video snapshot resolution based on the video ↵Chih-Chung Chang2011-11-032-9/+43
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | recording aspect ratio." into ics-mr0
| | * | | | 5554028: Select video snapshot resolution based on the video recording ↵Chih-Chung Chang2011-11-022-9/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aspect ratio. Change-Id: I7b01a21271068b9d201e38197e2a61b183f87902
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To comply with UI spec: 1. Change the text size to 12sp. 2. Change the pressed-state background. 3. Adjust the height to match the parent. bug:5521011 Change-Id: I4b99a1593aec67eb41c38ae97d54f3c9c4fce740
* | | | | | | 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
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | bug:5564100 Change-Id: Ia63d920e946f7ada7f16e98deb248eaac216e028
* | | | | | | 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
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5395575 Originally we have the fix for back to the first-level when recording, but it has another side-effect after merging the fix of icons overlapped issue. This change will fix the issue and make sure the available indicator is zoom control only during recording. Change-Id: Ic674c0a2c92a88c2cd2a3586a703f27784415582
* | | | | | Merge "Fix 5521540: UI Tweaks." into ics-mr1Wei Huang2011-11-0315-45/+66
|\ \ \ \ \ \
| * | | | | | Fix 5521540: UI Tweaks.Chih-Chung Chang2011-11-0315-45/+66
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - draw fan-shaped semi-transparent area on the indicator wheel. - change selected indicator color - remove video mode black border - set activity background to black - update assets - don't gray out unselected modes in mode picker (tablet) - set ok/cancel icons to 32dp, font to 12sp bold Change-Id: Iedc43dca29d1943965caf2d36cce176d8e509547
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5481928 Change-Id: Ic9a34b0f9e8d920afa5aec36561892045480e18c
* | | | | | | 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
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5561505 Change-Id: Iafd9e7ba4c60b4decae8f676ef2a1709cf54e5bb
* | | | | | | Enable camera controls after wakeup.Chung-yih Wang2011-11-031-19/+21
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | bug:5516230 Change-Id: Ibf0ab46070af9440f3c7fbef116d65264db0ea7e
* | | | | | 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
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | bug:5395575 Change-Id: I1493466068ce76dce957cd717a602939c66f138c
* | | | | | 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
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | bug:5515221 Change-Id: I9fe40f6492afdd8906ea2ad31839ec34f22a28b7
* | | | | | am 74e6575f: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-030-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '74e6575f4342b21435362f6b4ee2cb44c67d38e3': Import revised translations. DO NOT MERGE
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-022-10/+10
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I5cada420540817af969d5d99b64f7f56fa546307
* | | | | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-020-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | Change-Id: I1f671bf650765b06ffbccedc1a0f3906afc4d6f3
| * | | Revert "Merge "Remove long pressing shutter triggers autocous." into ics-mr0"The Android Automerger2011-11-023-3/+55
| | | | | | | | | | | | | | | | | | | | This reverts commit 4d55f6cb82c07a6191d2ab8e78fbab8c31e9db89, reversing changes made to 174b8b7fc4d55e8c63eb3ed0b71f1519a13e345d.
| * | | merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | Revert "Merge "Remove long pressing shutter triggers autocous." into ics-mr0"The Android Automerger2011-11-023-3/+55
| |/ / | | | | | | | | | | | | This reverts commit 4d55f6cb82c07a6191d2ab8e78fbab8c31e9db89, reversing changes made to 174b8b7fc4d55e8c63eb3ed0b71f1519a13e345d.
* | | Merge "Change the default orientation to portrait." into ics-mr1Angus Kong2011-11-0158-370/+1052
|\ \ \
| * | | Change the default orientation to portrait.Chung-yih Wang2011-11-0158-370/+1052
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5446617 Since the orientation is mainly portrait on phones, the default orientation of an application will decide if the window animation will be played before it starts. In order to reduce the launch time of Camera apps, this change is to skip the window animations by changing the default orientation to portrait. Change-Id: I6682ab408d7e8d1f0580f3c1600b6c9c3d6a7f6e
* | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-010-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: Id88ea6a8f34481b4dbbed4bfac44e8be2abf6ab2
generated by cgit v1.1 at 2025-08-18 00:33:48 +0000