summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Add hysteresis to orientation rounding.Eino-Ville Talvala2011-10-194-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | This prevents fast flickering between two orientation states, which can result in ugly UI issues, especially with the preview thumbnail. Bug: 5477483 Change-Id: I9513547207ae1918066c1a19947c974eaad72e24
* | | am 53d86908: Merge "Use video capture intent quality when recording with ↵Eino-Ville Talvala2011-10-191-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | effects." into ics-mr0 * commit '53d86908dc3e1cb54add568aa6bc325485e3efe5': Use video capture intent quality when recording with effects.
| * | Merge "Use video capture intent quality when recording with effects." into ↵Eino-Ville Talvala2011-10-191-2/+4
| |\ \ | | | | | | | | | | | | ics-mr0
| | * | Use video capture intent quality when recording with effects.Eino-Ville Talvala2011-10-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, effects always used 480p quality. When used for messaging, the intent requests a lower quality, and it needs to be used instead. Bug: 5465146 Change-Id: Ib2ae772de35ad84b8c19f961c71fd9ae43dd4426
* | | | am 55efc325: Fix 5480562: Set indicator orientation after video recording is ↵Chih-Chung Chang2011-10-191-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | stopped. * commit '55efc325fc17b911ed1d2a252ea82d995eca2360': Fix 5480562: Set indicator orientation after video recording is stopped.
| * | | Fix 5480562: Set indicator orientation after video recording is stopped.Chih-Chung Chang2011-10-191-0/+3
| |/ / | | | | | | | | | Change-Id: Ic7bd5fe93d38bbe1c291dc9eee82a5aefcfa7c3a
* | | am 967d36c0: Merge "Add timelapse recording support to effects mode." into ↵Pannag Sanketi2011-10-182-4/+52
|\ \ \ | |/ / | | | | | | | | | | | | | | | ics-mr0 * commit '967d36c02eca4ae3af6dcd93ac9c7ffd6401aea5': Add timelapse recording support to effects mode.
| * | Merge "Add timelapse recording support to effects mode." into ics-mr0Pannag Sanketi2011-10-182-4/+52
| |\ \
| | * | Add timelapse recording support to effects mode.Eino-Ville Talvala2011-10-182-4/+52
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5452088 Change-Id: I87c69e715ccdd6c48f18ecaa1fb4f362e2a9d567
* | | | am 66188959: Fix getting an empty thumbnail in reviewing panorama.Wei-Ta Chen2011-10-182-8/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '66188959498860c8b43ab7b9119c7b5c890c83dc': Fix getting an empty thumbnail in reviewing panorama.
| * | | Fix getting an empty thumbnail in reviewing panorama.Wei-Ta Chen2011-10-182-8/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The sample size for generating a thumbnail should be calculated in a way that also considers the case of a portrait image, i.e., height > width. The SharePopup should also puts the thumbnail of a portrait panorama in the center of the thumbnail view. Bug: 5411488 Change-Id: I5e86a91829de77f4694c039bd871e6831f3906cb
* | | am d7a60abb: Merge "Disable Thumbnailview when Panorama capture is ↵Wei Huang2011-10-182-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | inProgress." into ics-mr0 * commit 'd7a60abbee203872df4b5ab9a873e7efad80e239': Disable Thumbnailview when Panorama capture is inProgress.
| * | Merge "Disable Thumbnailview when Panorama capture is inProgress." into ics-mr0Wei Huang2011-10-182-0/+5
| |\ \
| | * | Disable Thumbnailview when Panorama capture is inProgress.heech.park2011-10-182-0/+5
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Step 1: Go to Camera Step 2: Change to Panorama shot Step 3: Capture Step 4: During capture tap on the album quick view Step 5: Observe that we are able to view album from quick view while capturing as panorama shot. bug:5475248 Change-Id: Ia74906e4a4c6b8b04e96724f76f98a37eaeb3189 Signed-off-by: Braganza Sam Roberts <sam.braganza@samsung.com>
* | | am ff55f519: Merge "Lock AE and AWB before autofocus starts." into ics-mr0Wei Huang2011-10-181-0/+26
|\ \ \ | |/ / | | | | | | | | | * commit 'ff55f519629fbe839fe051108b396565403d696e': Lock AE and AWB before autofocus starts.
| * | Merge "Lock AE and AWB before autofocus starts." into ics-mr0Wei Huang2011-10-181-0/+26
| |\ \
| | * | Lock AE and AWB before autofocus starts.Wu-cheng Li2011-10-181-0/+26
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Now camera API specifies autofocus does not lock AE and AWB. So the application locks AE/AWB when focus starts. AE/AWB are unlocked when focus finishes or preview starts. bug:5441274 Change-Id: Iddf21a413234bc3569187f4696d54099c362d008
* | | am e4a29ba9: Merge "Fix the NPE in onPause()." into ics-mr0Wei Huang2011-10-181-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'e4a29ba9b6e04a0e708d3653ecba927968d8da59': Fix the NPE in onPause().
| * | Merge "Fix the NPE in onPause()." into ics-mr0Wei Huang2011-10-181-1/+1
| |\ \
| | * | Fix the NPE in onPause().Chung-yih Wang2011-10-181-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | bug:5474906 We changed the order of onCreate. mLocationManager can be null if the app fails to open the camera. Change-Id: I31d3af5717ee320b6fb108db7f6c129355b366d9
* | | am b3548b65: Merge "Fix 5454202: make the UI work even if there is no goofy ↵Chih-Chung Chang2011-10-181-43/+71
|\ \ \ | |/ / | | | | | | | | | | | | | | | face effect." into ics-mr0 * commit 'b3548b653b277eabe2214396f2e9dbfe19eb6082': Fix 5454202: make the UI work even if there is no goofy face effect.
| * | Merge "Fix 5454202: make the UI work even if there is no goofy face effect." ↵Chih-Chung Chang2011-10-181-43/+71
| |\ \ | | | | | | | | | | | | into ics-mr0
| | * | Fix 5454202: make the UI work even if there is no goofy face effect.Chih-Chung Chang2011-10-181-43/+71
| | |/ | | | | | | | | | Change-Id: I6e498dac31538a1af57e2c79d5df3519f2ab57da
* | | am 046b8ced: Merge "Use calculated frame offset instead of gyroscope." into ↵Wei Huang2011-10-182-75/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | ics-mr0 * commit '046b8ced839d1b04c32d1207fe53f7639d69453b': Use calculated frame offset instead of gyroscope.
| * | Merge "Use calculated frame offset instead of gyroscope." into ics-mr0Wei Huang2011-10-182-75/+22
| |\ \
| | * | Use calculated frame offset instead of gyroscope.Angus Kong2011-10-182-75/+22
| | |/ | | | | | | | | | | | | bug:5359162 Change-Id: I319e9d54e08a2d711dc63bafa2593d6d68ef06fb
* | | am 136c335a: Fix 5472996: NPE in switchToOtherMode.Wu-cheng Li2011-10-181-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '136c335a69069bbb07af1a842acc4629c3131139': Fix 5472996: NPE in switchToOtherMode.
| * | Fix 5472996: NPE in switchToOtherMode.Wu-cheng Li2011-10-181-1/+1
| |/ | | | | | | Change-Id: Ied128d3cf5e8ee632c46f371aeaa0a42bb2f1cb5
| * Merge "Remove code introduced by mistake in MR0" into ics-mr0Eddy Talvala2011-10-141-4/+0
| |\
| | * Remove code introduced by mistake in MR0Rodrigo Carceroni2011-10-141-4/+0
| | | | | | | | | | | | Change-Id: Ic6dc692e703e04960e9a1f0d28d1ca2d59fc05ab
* | | Merge "fix auto merge issues."Wei Huang2011-10-171-6/+0
|\ \ \
| * | | fix auto merge issues.Wei Huang2011-10-171-6/+0
| | | | | | | | | | | | | | | | Change-Id: I0374abc65a037ebc61e340f2eace6a119436d1c8
* | | | am 9c96da0c: Fixing size limit error on video capture intent with effectsPannag Sanketi2011-10-172-1/+21
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '9c96da0c452cf980eb368cbb5a63afc4ab5f4bc4': Fixing size limit error on video capture intent with effects
| * | Fixing size limit error on video capture intent with effectsPannag Sanketi2011-10-142-1/+21
| |/ | | | | | | | | | | | | | | | | There was a problem with size limit using video capture intent with the effects on. The video would not recorded. This fixes that error, though the limit seems to be reached very soon (~5s). Related to bug: 5441217 Change-Id: I1ea372840831c8d0852368cb99fd2edecf1a3083
| * DO NOT MERGE: Change low storage threshold in video to 50MB.Chih-yu Huang2011-10-141-13/+7
| | | | | | | | | | bug:5334604 Change-Id: Iefc6a20ace2c7afbbc2cb7b3acf5ac957b4f16be
| * Merge "DO NOT MERGE" into ics-mr0Wei Huang2011-10-142-2/+8
| |\
| | * DO NOT MERGEChih-yu Huang2011-10-142-2/+8
| | | | | | | | | | | | | | | | | | | | | Change low storage threshold to 50MB. bug:5334604 Change-Id: I410bcf7322c71d1ca25d3de36d574616411b5533
* | | Fix build.Mike Dodd2011-10-171-0/+2
| | | | | | | | | | | | Change-Id: If6b2622e565e3bf736fe6968f1c90fa462ba5d89
* | | am f3d505af: Merge "Bug 5383077: handle video thumbnail generation correctly ↵Rodrigo Carceroni2011-10-171-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | when effects are on" into ics-mr0 * commit 'f3d505afe66e0961e904027e8ab98455ccd3bd2e': Bug 5383077: handle video thumbnail generation correctly when effects are on
| * | Merge "Bug 5383077: handle video thumbnail generation correctly when effects ↵Rodrigo Carceroni2011-10-142-5/+30
| |\ \ | | | | | | | | | | | | are on" into ics-mr0
| | * | Bug 5383077: handle video thumbnail generation correctly when effects are onRodrigo Carceroni2011-10-142-5/+30
| | | | | | | | | | | | | | | | Change-Id: I94d63c99dd8b8a488f5c8d660c592bc34d1b7360
* | | | resolved conflicts for merge of f3d505af to masterRodrigo Carceroni2011-10-142-5/+26
| | | | | | | | | | | | | | | | Change-Id: Ic7e9fdcb874b9c41e332c7e2c1bf896fd52b0b11
* | | | am f3b7efa2: Disable AE/AWB locking when shutting down effects.Eino-Ville Talvala2011-10-141-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f3b7efa21a1f2b365655acd8efffbdc1b83e6b0c': Disable AE/AWB locking when shutting down effects.
| * | | Disable AE/AWB locking when shutting down effects.Eino-Ville Talvala2011-10-141-0/+1
| |/ / | | | | | | | | | | | | Bug: 5463413 Change-Id: Idcd338adc5835e5a211e977b22a090e9dd2dfe4a
* | | am e3fd1952: Merge "Fixing crash in video capture intent with effects on" ↵Pannag Sanketi2011-10-142-11/+44
|\ \ \ | |/ / | | | | | | | | | | | | | | | into ics-mr0 * commit 'e3fd19525c55e58025faa0508c16fd410a159a5f': Fixing crash in video capture intent with effects on
| * | Merge "Fixing crash in video capture intent with effects on" into ics-mr0Pannag Sanketi2011-10-142-11/+44
| |\ \
| | * | Fixing crash in video capture intent with effects onPannag Sanketi2011-10-142-11/+44
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | The video capture intent sends an uri and not a filename. Adding support in the EffectsRecorder and VideoCamera for uri. The effectsrecorder passes that on to the MediaEncoderFilter. Related to bug: 5441217 Change-Id: I784a6c3b53a586950adcc07a6e26659838ae3cbc
| * | Set logging in effects recorder back to normal. DO NOT MERGE.Eino-Ville Talvala2011-10-141-1/+1
| |/ | | | | | | | | | | | | - Cherry-pick of change in master. Bug: 5404515 Change-Id: I3757e5ae2a032182ffe323e0cb0352b008f78181
* | Merge "Set logging in effects recorder back to normal."Eino-Ville Talvala2011-10-141-1/+1
|\ \
| * | Set logging in effects recorder back to normal.Eino-Ville Talvala2011-10-031-1/+1
| | | | | | | | | | | | | | | Bug: 5404515 Change-Id: I3757e5ae2a032182ffe323e0cb0352b008f78181