summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | 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
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | While running monkey, we encountered a usecase where Video Recording is inProgress and an intent to launch Panorama Activity came in. While switching StopVideoRecording failed and resulted in Camera Exception (observed 3 times in 2 weeks of testing). mCurrentVideoUri is not cleared, so the thumbnail of the last video is re-generated, which can take 3 seconds. bug:5596264 Change-Id: Ie14c426c81c46f2d9a6741b6213cf66b1dbb5612 Signed-off-by: Braganza Sam Roberts<sam.braganza@samsung.com> Signed-off-by: Heechan Park <heech.park@samsung.com>
* | am b27cfa9c: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-090-0/+0
|\ \ | | | | | | | | | | | | * commit 'b27cfa9cbe8d9de997557e5f5aac96c478de2c46': Import revised translations. DO NOT MERGE
| * | Import revised translations. DO NOT MERGEEric Fischer2011-11-081-2/+2
| | | | | | | | | | | | Change-Id: Id8c57f23a4d9a56796f77dfe02633598c09924c6
* | | New ZoomControl UI for tablet.Chung-yih Wang2011-11-096-130/+118
| |/ |/| | | | | | | bug:5349676 Change-Id: Ie1f4202d7f1d75978308ece4fbf486635cceead3
* | Changes to resolve jagged horizontal edge and blurred vertical edge issues.mbansal2011-11-082-11/+18
| | | | | | | | | | | | | | | | | | 1) Made the strip width and cross-fading parameters absolute pixel values. 2) Updated the above parameters to use thinner strips with lower cross-fading radius. 3) Added another parameter to limit the number of pyramid levels at which cross-fading is applied. Bug: 5578488 Change-Id: I69161bfbb535dc5bfcd647cfa6d6e050b6ad0068
* | 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
| | | | | | | | | | | | | | | bug: 5563072 Change-Id: I26ffe581b07c2a28da2c249bea2b913e64b3481f
* | | Change highlight pattern in indicatorbar.Chih-yu Huang2011-11-087-46/+33
|/ / | | | | | | | | | | | | | | | | | | Use the blue press state for all the icons in the setting bar, fill the whole bar width with a square instead of blue arc. Also make the share icon touch area larger. bug:5521011 Change-Id: I2db26c41758d230e8455696346a90a33b7e3efb6
* | 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
generated by cgit v1.1 at 2024-12-23 10:42:02 +0000