summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add time lapse label for Phone UI."Wei Huang2011-10-059-41/+68
|\
| * Add time lapse label for Phone UI.Angus Kong2011-10-059-41/+68
| | | | | | | | | | | | | | | | | | 1. The behavior on tablet UI and phone UI now is the same. 2. The recording time and time lapse label now always stay on the top-left corner (even when in portrait). bug:5394916 Change-Id: Ifa5013748dbdda3a6c0083569ec3c565b4c687eb
* | Merge "bugfix 5370554 camcorder preview background is inconsistent"Mark Wagner2011-10-051-0/+8
|\ \
| * | bugfix 5370554 camcorder preview background is inconsistentMark Wagner2011-10-041-0/+8
| |/ | | | | | | Change-Id: Iac812d08a446cc496b9c0162422c83720cc3ba04
* | Rearrange the second level indicator set.Chung-yih Wang2011-10-054-6/+22
| | | | | | | | | | | | | | | | | | bug:5360827 +change the icon spacing to 16dp +Store the geodata in the video. Change-Id: I133871066b6b9a8918f861f0510e3996d5b0f839
* | Merge "Fix display of preview thumbnail after recording video."Wu-cheng Li2011-10-042-12/+19
|\ \
| * | Fix display of preview thumbnail after recording video.Mike Dodd2011-10-042-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first was that the code was trying to rotate the video thumbnail retrieved from MetadataRetriever back by just reversing whatever rotation we set as a playback hint when we started recording. But this isn't actually correct -- the bitmap we get back from MetadataRetriever is going to be oriented correctly for display if the device is oriented in the locked UI orientation (landscape), and we need to rotate it to compensate for what the actual device orientation is relative to that. Phrased another way, we were taking into account the camera and device orientation, but not the UI orientation. This just happened to work on some devices because of their camera orientations, but not all. bug:5360349 Change-Id: I8b481907c211328726ecd91fa054b9e9a4798601
* | | Merge "bugfix 5340803 Deleted panorama still shown."Mark Wagner2011-10-041-0/+1
|\ \ \
| * | | bugfix 5340803 Deleted panorama still shown.Mark Wagner2011-10-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Second part for this fix. 139755 has the first half. Change-Id: I9268bf3bb1a604f369fdf6056cb8a7dcd47b3632
* | | | Merge "bugfix 5388221 Last captured (photo, video, panorama) thumbnail ↵Mark Wagner2011-10-041-3/+23
|\ \ \ \ | |/ / / | | | | | | | | disappears in panaromic mode"
| * | | bugfix 5388221 Last captured (photo, video, panorama) thumbnail disappears ↵Mark Wagner2011-10-041-3/+23
| | |/ | |/| | | | | | | | | | | | | in panaromic mode Change-Id: I6dc31868870e27ea2c8446deb1cbb430bafe44ca
* | | Merge "bugfix 5244268 Remove animation of mode-picker and thumbnail in Panorama"Mark Wagner2011-10-041-28/+4
|\ \ \
| * | | bugfix 5244268 Remove animation of mode-picker and thumbnail in PanoramaMark Wagner2011-10-041-28/+4
| |/ / | | | | | | | | | Change-Id: I7172e104db252ad1200812771ab2890733af4847
* | | Merge "Add support for rotating background video based on device orientation."Eino-Ville Talvala2011-10-043-1/+9
|\ \ \ | |/ / |/| |
| * | Add support for rotating background video based on device orientation.Eino-Ville Talvala2011-10-033-1/+9
| | | | | | | | | | | | | | | Bug: 5355973 Change-Id: I5c0145a717c22b9423341988b90c4962ad333337
* | | Blending updates to handle the case of mosaicing with the device in portrait ↵mbansal2011-10-031-49/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | mode. 1) Updated the wide-strip blending algorithm to select the strips correctly for portrait mode mosaicing. 2) Updated the cropping algorithm to crop correctly for portrait mode mosaicing. Change-Id: I0f613367d86c8ef380e1334b13426671182ddb85
* | | Merge "Revert "Lock AE and AWB before autofocus starts.""Wu-cheng Li2011-10-031-17/+0
|\ \ \ | |_|/ |/| |
| * | Revert "Lock AE and AWB before autofocus starts."Wu-cheng Li2011-10-041-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d5b2118fc4aa377a3c4f5e4052745f14ec78b2c4. This commit incorrectly calls setParameters during autofocus. bug:5365121 Change-Id: If039e56390bfb94c518a3381001095bce050de7e
* | | Merge "Reduce the frame memory we allocate."Wei-Ta Chen2011-10-031-14/+7
|\ \ \ | |_|/ |/| |
| * | Reduce the frame memory we allocate.Wei-Ta Chen2011-10-031-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We increment the LR frame counter and the HR frame counter at the same time and check the frame limit condition based on which counter hits the limit first. We can just combine the MAX_FRAMES_HR and MAX_FRAMES_LR to one. This reduces the memory we allocate to LR frames by 8~20 MBytes depending on the size of an input frame. Change-Id: I1b76d94db09985df21c946830295b94f39e99e59
* | | Temporarily increase logging verbosity to help track down crashes.Eino-Ville Talvala2011-10-031-4/+13
| | | | | | | | | | | | | | | | | | For bugs: 5388119, 5388011, 5397146 Change-Id: I6f7c8d526629bb63f3d026a702fc944902c35c8f
* | | Merge "Initial fix for bug 5357970: Camera now handles errors during effects ↵Marius Renn2011-10-032-2/+29
|\ \ \ | | | | | | | | | | | | recording."
| * | | Initial fix for bug 5357970: Camera now handles errors during effects recording.Marius Renn2011-09-292-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, the camera front-end deletes the recorded file and then continues to throw the exception upwards. Recovering from this situation gracefully will require more work and testing. Change-Id: I98814d5143090f1bc7b92561fd7aae58b3a166a6
* | | | Merge "Fix recording time label in portrait mode."Angus Kong2011-10-034-27/+42
|\ \ \ \
| * | | | Fix recording time label in portrait mode.Angus Kong2011-10-034-27/+42
| | | | | | | | | | | | | | | | | | | | | | | | | bug:5039042 Change-Id: I61dd597b0b71566a00eb1cca45ea0b3e3019fac6
* | | | | Merge "Add timelapse assets."Chung-yih Wang2011-10-0352-1/+13
|\ \ \ \ \
| * | | | | Add timelapse assets.Chung-yih Wang2011-10-0352-1/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | bug:5360827 Change-Id: I9df68f73747211774c949ee0dba8f1be11f4e450
* | | | | Add Exposure assets.Chung-yih Wang2011-10-037-2/+3
|/ / / / | | | | | | | | | | | | | | | | bug:5360827 Change-Id: I0cc0c32235f4f20181c2369e1fc2a8725547bdf0
* | | | Fix the UI issue during video recording.Chung-yih Wang2011-10-034-8/+26
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5395575 Start recording when 2nd level settings are open, it should return to 1st level controls during recording with zoom control only displayed When recording is stopped continue to display 1st level controls - settings and switch camera icons reappear. Change-Id: I502f2486c764dce8baa35cd45e00cd324930c894
* | | Merge "Import revised translations."Eric Fischer2011-09-3046-621/+363
|\ \ \ | |_|/ |/| |
| * | Import revised translations.Eric Fischer2011-09-3046-621/+363
| | | | | | | | | | | | Change-Id: I2127c23caf8c40efedac048bded096d8a92b102d
* | | Issue: panorama preview is rotated 90 deg after lock and unlock.Raji Reddy Kandi2011-09-302-9/+21
|/ / | | | | | | | | | | | | Fixed.panorama preview is rotated 90 deg after lock and unlock. Its fixed. Change-Id: Ibc5e3d18a56b3900c0715a3aeb7f345ccc476fca Signed-off-by: Raji Reddy Kandi <rajireddy.k@samsung.com>
* | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-300-0/+0
|\ \ | | | | | | | | | Change-Id: Ie08f18d07451e4b82611aa4b8d33e471b642ab82
| * \ merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-300-0/+0
| |\ \
* | \ \ am bd29d3c5: Use smaller focus area and larger metering area.Chih-yu Huang2011-09-302-23/+39
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'bd29d3c5d59b375d77334aaa426545dc781b95fd': Use smaller focus area and larger metering area.
| * | | Use smaller focus area and larger metering area.Chih-yu Huang2011-09-302-23/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the length of focusIndicator to 1/4 of height. bug:5371513 Change-Id: I1a242b9caec9c59c4d6ce2cd70fcf6d4e55dcfc9
* | | | Merge "Remove mContext varaibles in Views."Chung-yih Wang2011-09-306-15/+9
|\ \ \ \
| * | | | Remove mContext varaibles in Views.Chung-yih Wang2011-09-306-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since mContext is already a protected member in View, we should reuse it instead. Change-Id: I7bad94a8e7aabc6c4141be8950a867ff70e63731
* | | | | Merge "Fix the single popup issue."Chung-yih Wang2011-09-307-18/+119
|\ \ \ \ \
| * | | | | Fix the single popup issue.Chung-yih Wang2011-09-307-18/+119
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5169941 Popups should not persist when another is opened. +Rename the confusing PopupChange listener. Change-Id: Idca3218c090c8d9d176dbb97d8077dcc27409368
* | | | | Merge "Reset zoom UI in onResume."Wu-cheng Li2011-09-304-16/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Reset zoom UI in onResume.Wu-cheng Li2011-09-304-16/+22
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Zoom value was reset to 0, but the UI was not updated. bug:5390413 Change-Id: I16ef04012c13f4e9acbbf44a957e01960570f4bc
* | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-290-0/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| Change-Id: I856cb29ef8652d51b45517dd9bf932afef479539
| * | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-280-0/+0
| |\ \ | | |/ | |/|
| | * merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-280-0/+0
| | |\
| | | * merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-270-0/+0
| | | |\
* | | | \ Merge "Fix ModePicker selection UI."Chung-yih Wang2011-09-293-29/+28
|\ \ \ \ \
| * | | | | Fix ModePicker selection UI.Chung-yih Wang2011-09-293-29/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5353407 -The mode icon should be highlighted when tapped, not after the mode picker has animated closed. Change-Id: I6ff29acb2952653c2b6ebde447e160e202fd7fc6
* | | | | | Merge "Add dimension attributes to MediaStore."Angus Kong2011-09-294-10/+17
|\ \ \ \ \ \
| * | | | | | Add dimension attributes to MediaStore.Angus Kong2011-09-294-10/+17
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Width/height of still images added. 2. Resolution of videos added. bug:5376821 Change-Id: I809743ae777e6bbc01e3a86651e7cd6489a81c86
generated by cgit v1.1 at 2025-01-10 17:14:36 +0000